mds: cancel context correctly if we already have required osdmap in hand

By simply deleting the fin, the callbacks will be requeued into
the specified finisher and recalled later, which is not the expected
behaviour.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/common/Finisher.h b/src/common/Finisher.h
index 4d494ed15333d92802c29d12a593462884829613..ffdddf632e8d3726bbc0a48367cc1a1ed87ae140 100644 (file)
--- a/src/common/Finisher.h
+++ b/src/common/Finisher.h
@@ -173,8 +173,17 @@ public:
     assert(fin != NULL);
     assert(con != NULL);
   }
+
+  ~C_OnFinisher() {
+    if (con != nullptr) {
+      delete con;
+      con = nullptr;
+    }
+  }
+
   void finish(int r) {
     fin->queue(con, r);
+    con = nullptr;
   }
 };
 

diff --git a/src/mds/MDSContext.h b/src/mds/MDSContext.h
index d26d1bdb783a6ccdeead1ea497bb9ba0e02550b6..a69223dc7b3eb7c4a464b5ac989dd10d65351c76 100644 (file)
--- a/src/mds/MDSContext.h
+++ b/src/mds/MDSContext.h
@@ -135,8 +135,17 @@ public:
   C_IO_Wrapper(MDSRank *mds_, MDSInternalContextBase *wrapped_) : MDSIOContext(mds_), wrapped(wrapped_) {
     assert(wrapped != NULL);
   }
+
+  ~C_IO_Wrapper() {
+    if (wrapped != nullptr) {
+      delete wrapped;
+      wrapped = nullptr;
+    }
+  }
+
   virtual void finish(int r) {
     wrapped->complete(r);
+    wrapped = nullptr;
   }
 };