From: Patrick Donnelly <pdonnell@redhat.com>
Date: Wed, 12 Jul 2023 20:16:17 +0000 (-0400)
Subject: mon: do not change pending if strategy is unchanged
X-Git-Tag: v19.0.0~446^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=27f1021a97edc2c84801cb380c22c7cd79d577d6;p=ceph.git

mon: do not change pending if strategy is unchanged

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
---

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 2ae4afaf0b8e..1226c8a82419 100644
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -929,6 +929,10 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op)
       err = -EINVAL;
       goto reply_no_propose;
     }
+    if (strategy == pending_map.strategy) {
+      err = 0;
+      goto reply_no_propose;
+    }
     pending_map.strategy = strategy;
     pending_map.last_changed = ceph_clock_now();
   } else if (prefix == "mon add disallowed_leader") {