From 1777333aec71e054f41a32596c564c7709dd4e33 Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 3 Mar 2017 12:25:05 +0000 Subject: [PATCH] mds: handle Journaler::recover errors in PurgeQueue Signed-off-by: John Spray --- src/mds/PurgeQueue.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index af2ca3a2ad657..f9617b81643b9 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); } })); } -- 2.39.5