]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "mds: just delete MDSIOContextBase during shutdown"
authorYan, Zheng <zyan@redhat.com>
Mon, 23 Mar 2020 09:03:56 +0000 (17:03 +0800)
committerVicente Cheng <freeze.bilsted@gmail.com>
Thu, 16 Apr 2020 06:07:21 +0000 (06:07 +0000)
This reverts commit 79f5052a1ddb61043de4e1cbec19ede2a6b4f53b.

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

src/mds/MDSContext.cc

index af2c0892d35d5cd84c8829c55e10ec7672c24a06..eecaa81e47e9c782c654d67a4830853fd3bd105e 100644 (file)
@@ -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 {