]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: remove crush node flags too on "crush rm"
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 23 Apr 2019 03:24:07 +0000 (11:24 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 24 Apr 2019 01:08:35 +0000 (09:08 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ee4d718d0fd049120aa5d1c2380efba5aa312b71)

src/mon/OSDMonitor.cc

index 88693b09ad2f067d720c7b7a186da6b2bfcc7cb4..8f1c2a5fd60f5fbd54e997b88a1b29100704ece7 100644 (file)
@@ -9626,6 +9626,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
        break;
       }
       if (err == 0) {
+        if (!unlink_only)
+          pending_inc.new_crush_node_flags[id] = 0;
        ss << "removed item id " << id << " name '" << name << "' from crush map";
        getline(ss, rs);
        wait_for_finished_proposal(op, new Monitor::C_Command(mon, op, 0, rs,