From: Sage Weil <sage@redhat.com>
Date: Mon, 15 Jul 2019 17:48:40 +0000 (-0500)
Subject: mon/OSDMonitor: tolerate duplicate MRemoveSnaps messages
X-Git-Tag: v15.1.0~2184^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=162488389092bea7a1f9a51af328ac2f5adc5caf;p=ceph-ci.git

mon/OSDMonitor: tolerate duplicate MRemoveSnaps messages

Fixes: http://tracker.ceph.com/issues/40774
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 86d9eb486e2..0bc73206f8e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3723,7 +3723,9 @@ bool OSDMonitor::prepare_remove_snaps(MonOpRequestRef op)
     for (auto s : snaps) {
       if (!_is_removed_snap(pool, s) &&
 	  (!pending_inc.new_pools.count(pool) ||
-	   !pending_inc.new_pools[pool].removed_snaps.contains(s))) {
+	   !pending_inc.new_pools[pool].removed_snaps.contains(s)) &&
+	  (!pending_inc.new_removed_snaps.count(pool) ||
+	   !pending_inc.new_removed_snaps[pool].contains(s))) {
 	pg_pool_t *newpi = pending_inc.get_new_pool(pool, &pi);
 	if (osdmap.require_osd_release < ceph_release_t::octopus) {
 	  newpi->removed_snaps.insert(s);