]> git.apps.os.sepia.ceph.com Git - ceph-ci.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>
Tue, 23 Apr 2019 04:40:50 +0000 (12:40 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/mon/OSDMonitor.cc

index e913c64a00f9115556098589065f1911636846d8..677015d684d8dfd6fb10c3814effcba49faf0075 100644 (file)
@@ -9635,6 +9635,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,