From 0a5713ceaac26d60a458398db52c67034018b047 Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 19 Sep 2016 17:34:26 +0100 Subject: [PATCH] mds: handle blacklisting during journal recovery EBLACKLISTED was being incorrectly handled as an indication of metadata damage. Fixes: http://tracker.ceph.com/issues/17236 Signed-off-by: John Spray (cherry picked from commit 19bb8c0df9b48ebbccfd1913126bb48b6337319e) --- src/mds/MDLog.cc | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 795ffb3f5b291..260e874705640 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -910,6 +910,10 @@ void MDLog::_recovery_thread(MDSInternalContextBase *completion) int write_result = jp.save(mds->objecter); // Nothing graceful we can do for this assert(write_result >= 0); + } else if (read_result == -EBLACKLISTED) { + derr << "Blacklisted during JournalPointer read! Respawning..." << dendl; + mds->respawn(); + assert(0); // Should be unreachable because respawn calls execv } else if (read_result != 0) { mds->clog->error() << "failed to read JournalPointer: " << read_result << " (" << cpp_strerror(read_result) << ")"; @@ -936,7 +940,11 @@ void MDLog::_recovery_thread(MDSInternalContextBase *completion) C_SaferCond recover_wait; back.recover(&recover_wait); int recovery_result = recover_wait.wait(); - if (recovery_result != 0) { + if (recovery_result == -EBLACKLISTED) { + derr << "Blacklisted during journal recovery! Respawning..." << dendl; + mds->respawn(); + assert(0); // Should be unreachable because respawn calls execv + } else if (recovery_result != 0) { // Journaler.recover succeeds if no journal objects are present: an error // means something worse like a corrupt header, which we can't handle here. mds->clog->error() << "Error recovering journal " << jp.front << ": " @@ -979,7 +987,11 @@ void MDLog::_recovery_thread(MDSInternalContextBase *completion) int recovery_result = recover_wait.wait(); dout(4) << "Journal " << jp.front << " recovered." << dendl; - if (recovery_result != 0) { + if (recovery_result == -EBLACKLISTED) { + derr << "Blacklisted during journal recovery! Respawning..." << dendl; + mds->respawn(); + assert(0); // Should be unreachable because respawn calls execv + } else if (recovery_result != 0) { mds->clog->error() << "Error recovering journal " << jp.front << ": " << cpp_strerror(recovery_result); mds->damaged_unlocked(); -- 2.39.5