From f2daa19c8d5a61f032db87f7ae844340549c2351 Mon Sep 17 00:00:00 2001 From: John Spray Date: Thu, 18 Jun 2015 11:08:05 +0100 Subject: [PATCH] mds: drop MDSIOContext on mds->stopping `stopping` is true once the MDS has entered suicide(). During this phase, any MDSIOContexts that are called (e.g. from objecter, journaler) become no-ops. Signed-off-by: John Spray --- src/mds/MDSContext.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc index 9a9a6f15ba1..59854ff2869 100644 --- a/src/mds/MDSContext.cc +++ b/src/mds/MDSContext.cc @@ -52,6 +52,12 @@ void MDSIOContextBase::complete(int r) { dout(10) << "MDSIOContextBase::complete: " << typeid(*this).name() << dendl; assert(mds != NULL); Mutex::Locker l(mds->mds_lock); + if (mds->stopping) { + dout(4) << "MDSIOContextBase::complete: dropping for stopping " + << typeid(*this).name() << dendl; + return; + } + if (r == -EBLACKLISTED) { derr << "MDSIOContextBase: blacklisted! Restarting..." << dendl; mds->respawn();