From 5a4c5985008e6f72bd067e39538ec8600310ff96 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Tue, 25 Feb 2020 10:36:11 -0800 Subject: [PATCH] mds: just delete MDSIOContextBase during shutdown We don't want the finisher called during shutdown. Fixes: https://tracker.ceph.com/issues/44295 Fixes: 73436961512bd87981244fa48212085faf7028c4 Signed-off-by: Patrick Donnelly (cherry picked from commit 79f5052a1ddb61043de4e1cbec19ede2a6b4f53b) --- src/mds/MDSContext.cc | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc index eecaa81e47e9c..af2c0892d35d5 100644 --- a/src/mds/MDSContext.cc +++ b/src/mds/MDSContext.cc @@ -98,11 +98,8 @@ void MDSIOContextBase::complete(int r) { if (mds->is_daemon_stopping()) { dout(4) << "MDSIOContextBase::complete: dropping for stopping " << typeid(*this).name() << dendl; - MDSContext::complete(r); - return; - } - - if (r == -EBLACKLISTED) { + delete this; + } else if (r == -EBLACKLISTED) { derr << "MDSIOContextBase: blacklisted! Restarting..." << dendl; mds->respawn(); } else { -- 2.39.5