From: Sage Weil <sage@inktank.com>
Date: Thu, 16 May 2013 16:42:11 +0000 (-0700)
Subject: mds: avoid assert after suicide()
X-Git-Tag: v0.63~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=64871e093159ad06d84fb2a84c7808a81800dfc4;p=ceph.git

mds: avoid assert after suicide()

Fixes: #5079
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 094aefdf5563..cc661f214860 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -5653,9 +5653,11 @@ void MDCache::_recovered(CInode *in, int r, uint64_t size, utime_t mtime)
 
   if (r != 0) {
     dout(0) << "recovery error! " << r << dendl;
-    if (r == -EBLACKLISTED)
+    if (r == -EBLACKLISTED) {
       mds->suicide();
-    assert(0);
+      return;
+    }
+    assert(0 == "unexpected error from osd during recovery");
   }
 
   file_recovering.erase(in);