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

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index c8d65f051a3e90e6cca3cf61587ea58ad7a5fd78..99cea95bcf18bc0cf7bfec86a95db56a08e76cb3 100644 (file)
--- 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;