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 9b35b66ba4b9491e7fe374d4a61ce0afd652ea51..62518ae83dcd6a8d509ddd44889cd1620a5834cc 100644 (file)
--- 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);