summaryrefslogtreecommitdiffstats
path: root/src/mon/OSDMonitor.cc
diff options
context:
space:
mode:
authorxie xingguo <xie.xingguo@zte.com.cn>2019-04-23 05:24:07 +0200
committerxie xingguo <xie.xingguo@zte.com.cn>2019-04-23 06:40:50 +0200
commitee4d718d0fd049120aa5d1c2380efba5aa312b71 (patch)
treef4b58b8956547ba8701942cb95ba74973e1baa25 /src/mon/OSDMonitor.cc
parentmon/OSDMonitor: make per-OSD no{out,down,in,out} flags prior to CRUSH nodes (diff)
downloadceph-ee4d718d0fd049120aa5d1c2380efba5aa312b71.tar.xz
ceph-ee4d718d0fd049120aa5d1c2380efba5aa312b71.zip
mon/OSDMonitor: remove crush node flags too on "crush rm"
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
Diffstat (limited to '')
-rw-r--r--src/mon/OSDMonitor.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index e913c64a00f..677015d684d 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -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,