From: Sage Weil <sage@newdream.net>
Date: Tue, 28 Oct 2008 20:45:30 +0000 (-0700)
Subject: mon: ensure snap doesn't already exist in pending set
X-Git-Tag: v0.5~179
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=db11db14ccc63e30c02411eee6567c3ceee3c6ec;p=ceph.git

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 633ba3e560d5..c41494d9dae8 100644
--- 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);
     }