mds: handle corrupt dentry more cleanly

Calling damaged() on the rank is overkill, but until
we have a mechanism to selectively handle damaged
paths, it's better than killing the daemon.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
index f17740eb79dc92cf651dac65bceef7d3a2f2e300..64564809c461170ed617b229be3484562bb191a7 100644 (file)
--- a/src/mds/CDir.cc
+++ b/src/mds/CDir.cc
@@ -1773,8 +1773,14 @@ void CDir::_omap_fetched(bufferlist& hdrbl, map<string, bufferlist>& omap,
        }
       }
     } else {
-      dout(1) << "corrupt directory, i got tag char '" << type << "' pos " << pos << dendl;
-      assert(0);
+      dout(1) << "corrupt directory, i got tag char '" << type << "' pos "
+        << pos << dendl;
+      cache->mds->clog->error() << "Corrupt directory entry '" << p->first
+        << "' in dirfrag " << *this;
+      // TODO: add a mechanism for selectively marking a path
+      // damaged, rather than marking the whole rank damaged.
+      cache->mds->damaged();
+      assert(0);  // Unreachable: damaged() respawns us
     }
     
     if (dn && want_dn.length() && want_dn == dname) {