From: Yan, Zheng <zyan@redhat.com>
Date: Mon, 23 Mar 2020 09:03:56 +0000 (+0800)
Subject: Revert "mds: just delete MDSIOContextBase during shutdown"
X-Git-Tag: v14.2.10~138^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a841f7e10e3a0ad208bd803ade467af9f4c8bc1;p=ceph.git

Revert "mds: just delete MDSIOContextBase during shutdown"

This reverts commit 79f5052a1ddb61043de4e1cbec19ede2a6b4f53b.

Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
(cherry picked from commit 02658de9eeb700364af02f2c7710c3819e776fb2)
---

diff --git a/src/mds/MDSContext.cc b/src/mds/MDSContext.cc
index af2c0892d35d..eecaa81e47e9 100644
--- a/src/mds/MDSContext.cc
+++ b/src/mds/MDSContext.cc
@@ -98,8 +98,11 @@ void MDSIOContextBase::complete(int r) {
   if (mds->is_daemon_stopping()) {
     dout(4) << "MDSIOContextBase::complete: dropping for stopping "
             << typeid(*this).name() << dendl;
-    delete this;
-  } else if (r == -EBLACKLISTED) {
+    MDSContext::complete(r);
+    return;
+  }
+
+  if (r == -EBLACKLISTED) {
     derr << "MDSIOContextBase: blacklisted!  Restarting..." << dendl;
     mds->respawn();
   } else {