]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: add a process that handle Callback Arguments 29624/head
authorNancySu05 <su_nan@inspur.com>
Tue, 13 Aug 2019 03:02:10 +0000 (11:02 +0800)
committerNancySu05 <su_nan@inspur.com>
Tue, 20 Aug 2019 07:47:13 +0000 (15:47 +0800)
in C_AckMarkedDown,we add a process that handle _finish(int) Callback Arguments

Fixes: https://tracker.ceph.com/issues/41217
Signed-off-by: NancySu05 <su_nan@inspur.com>
src/mon/OSDMonitor.cc

index 64430dc55293391517df7b2f3055f9d16833c800..d7aa48b03dc3878913226a70fb428db7e32a621f 100644 (file)
@@ -2542,16 +2542,22 @@ public:
     MonOpRequestRef op)
     : C_MonOp(op), osdmon(osdmon) {}
 
-  void _finish(int) override {
-    MOSDMarkMeDown *m = static_cast<MOSDMarkMeDown*>(op->get_req());
-    osdmon->mon->send_reply(
-      op,
-      new MOSDMarkMeDown(
-       m->fsid,
-       m->target_osd,
-       m->target_addrs,
-       m->get_epoch(),
-       false));   // ACK itself does not request an ack
+  void _finish(int r) override {
+    if (r == 0) {
+      MOSDMarkMeDown *m = static_cast<MOSDMarkMeDown*>(op->get_req());
+      osdmon->mon->send_reply(
+        op,
+        new MOSDMarkMeDown(
+          m->fsid,
+          m->target_osd,
+          m->target_addrs,
+          m->get_epoch(),
+          false));   // ACK itself does not request an ack
+    } else if (r == -EAGAIN) {
+        osdmon->dispatch(op);
+    } else {
+        ceph_abort_msgf("C_AckMarkedDown: unknown result %d", r);
+    }
   }
   ~C_AckMarkedDown() override {
   }