From: John Spray <john.spray@redhat.com>
Date: Fri, 3 Mar 2017 12:25:05 +0000 (+0000)
Subject: mds: handle Journaler::recover errors in PurgeQueue
X-Git-Tag: v12.0.1~140^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F12786%2Fhead;p=ceph.git

mds: handle Journaler::recover errors in PurgeQueue

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

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index af2ca3a2ad6..f9617b81643 100644
--- a/src/mds/PurgeQueue.cc
+++ b/src/mds/PurgeQueue.cc
@@ -136,13 +136,16 @@ void PurgeQueue::open(Context *completion)
       dout(1) << "Purge Queue not found, assuming this is an upgrade and "
                  "creating it." << dendl;
       create(completion);
-    } else {
+    } else if (r == 0) {
       Mutex::Locker l(lock);
       dout(4) << "open complete" << dendl;
       if (r == 0) {
         journaler.set_writeable();
       }
       completion->complete(r);
+    } else {
+      derr << "Error " << r << " loading Journaler" << dendl;
+      on_error->complete(0);
     }
   }));
 }