mon: ensure snap doesn't already exist in pending set

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 633ba3e560d5630d79bbe3564b3a7b2ddaf6a427..c41494d9dae872f732849eaac37c011ae2ede0cd 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -612,7 +612,8 @@ bool OSDMonitor::prepare_remove_snaps(MRemoveSnaps *m)
     if (*p > max)
       max = *p;
 
-    if (!osdmap.removed_snaps.contains(*p)) {
+    if (!osdmap.removed_snaps.contains(*p) &&
+       !pending_inc.removed_snaps.contains(*p)) {
       dout(10) << " adding " << *p << " to removed_snaps" << dendl;
       pending_inc.removed_snaps.insert(*p);
     }