mon/OSDMonitor: fix off-by-one when updating new_last_in_change

E.g., osdmap.osd_weight[osdmap.max_osd] does not exist.

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 72b464ba6d4e59e12d07254ad13009a59493e6b2..279fe674bfcf18c2d7d368fbd335fc0b4020a070 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1166,14 +1166,16 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
     pending_inc.new_last_up_change = pending_inc.modified;
   }
   for (auto& i : pending_inc.new_weight) {
-    if (i.first > osdmap.max_osd) {
+    if (i.first >= osdmap.max_osd) {
       if (i.second) {
        // new osd is already marked in
        pending_inc.new_last_in_change = pending_inc.modified;
+        break;
       }
     } else if (!!i.second != !!osdmap.osd_weight[i.first]) {
       // existing osd marked in or out
       pending_inc.new_last_in_change = pending_inc.modified;
+      break;
     }
   }