mon/OSDMonitor: newly created osd should not be wrongly marked in

if we are creating an osd which has the same id as a previously
removed 'in' osd, we should not mark this newly created osd as 'in'

Signed-off-by: runsisi <runsisi@zte.com.cn>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 972a60cf2529d5b3a1d589f41b643083bd6f89af..ac361f6003ad9144fe9191f30f5d565b14f75996 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -6933,8 +6933,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       if (!osdmap.exists(i) &&
          pending_inc.new_up_client.count(i) == 0 &&
          (pending_inc.new_state.count(i) == 0 ||
-          (pending_inc.new_state[i] & CEPH_OSD_EXISTS) == 0))
+          (pending_inc.new_state[i] & CEPH_OSD_EXISTS) == 0)) {
+        pending_inc.new_weight[i] = CEPH_OSD_OUT;
        goto done;
+      }
     }
 
     // raise max_osd