]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon: add a process that handle Callback Arguments 29997/head
authorNancySu05 <su_nan@inspur.com>
Tue, 13 Aug 2019 03:02:10 +0000 (11:02 +0800)
committerNathan Cutler <ncutler@suse.com>
Thu, 29 Aug 2019 10:47:34 +0000 (12:47 +0200)
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>
(cherry picked from commit 57e8411578d3edd4cd4ff2a93d57407451a6d219)

src/mon/OSDMonitor.cc

index 3f50e6fd3d261a169caa87485ab046533c02017b..7de196a3b0fea2e736325b118ed6e49c0b08b38f 100644 (file)
@@ -2383,16 +2383,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 {
   }