From: Sage Weil <sage@newdream.net>
Date: Wed, 12 May 2010 18:53:50 +0000 (-0700)
Subject: mds: warn, don't crash, on trailing garbage in dir objects
X-Git-Tag: v0.20.1~5
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b1cfe5e7106c6a263688993ba1997c820774d983;p=ceph.git

mds: warn, don't crash, on trailing garbage in dir objects
---

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index 8de3e5fd64d0..99838e55b4ed 100644
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1327,7 +1327,11 @@ void CDir::_fetched(bufferlist &bl)
       }
     }
   }
-  assert(p.end());
+  if (!p.end()) {
+    stringstream ss;
+    ss << "dir " << dirfrag() << " has " << bl.length() - p.get_off() << " extra bytes";
+    cache->mds->logclient.log(LOG_WARN, ss);
+  }
 
   //cache->mds->logger->inc("newin", num_new_inodes_loaded);
   //hack_num_accessed = 0;