From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 23 Apr 2019 03:24:07 +0000 (+0800)
Subject: mon/OSDMonitor: remove crush node flags too on "crush rm"
X-Git-Tag: v14.2.2~213^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44718ee713731ca28d7705efc685eb040b0759c7;p=ceph.git

mon/OSDMonitor: remove crush node flags too on "crush rm"

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit ee4d718d0fd049120aa5d1c2380efba5aa312b71)
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 88693b09ad2..8f1c2a5fd60 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -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,