From: Patrick Donnelly <pdonnell@redhat.com>
Date: Sat, 16 Feb 2019 22:30:41 +0000 (-0800)
Subject: mds: avoid gather assertion when subs exist
X-Git-Tag: v12.2.13~224^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=612e90f0b79e34126e9aef8c2eef52a774c51c17;p=ceph.git

mds: avoid gather assertion when subs exist

If the gather has subs and is deleted, we hit this assertion:

    ceph_assert(activated);

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit 0a0f9a080050736c27c22cf6aeda056e90275818)
---

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 9b35b66ba4b..62518ae83dc 100644
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -343,7 +343,8 @@ private:
         delete gather;
         return handle_recall_client_state(0);
       } else if (recall_timeout > 0 && duration > recall_timeout) {
-        delete gather;
+        gather->set_finisher(new C_MDSInternalNoop);
+        gather->activate();
         return handle_recall_client_state(-ETIMEDOUT);
       } else {
         uint64_t remaining = (recall_timeout == 0 ? 0 : recall_timeout-duration);