mds: handle EBLACKLISTED in MDCache::do_file_recover; assert on errors

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 607778762fe8a713781768e0842a306aefbefbca..3767ba2917ded86ccc1cfb1b8122a1371e364f2b 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5049,6 +5049,13 @@ void MDCache::_recovered(CInode *in, int r, uint64_t size, utime_t mtime)
   dout(10) << "_recovered r=" << r << " size=" << in->inode.size << " mtime=" << in->inode.mtime
           << " for " << *in << dendl;
 
+  if (r != 0) {
+    dout(0) << "recovery error! " << r << dendl;
+    if (r == -EBLACKLISTED)
+      mds->suicide();
+    assert(0);
+  }
+
   file_recovering.erase(in);
   in->state_clear(CInode::STATE_RECOVERING);