From: Sage Weil <sage@newdream.net>
Date: Mon, 26 Sep 2011 23:36:54 +0000 (-0700)
Subject: mon: fix it again
X-Git-Tag: v0.36~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=56ce7c20e92b18da08e613482c3f79ee496125c4;p=ceph.git

mon: fix it again

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index db5120c1d643..c31a5d9667e0 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1349,10 +1349,15 @@ int OSDMonitor::prepare_new_pool(MPoolOp *m)
 
 int OSDMonitor::prepare_new_pool(string& name, uint64_t auid, int crush_rule)
 {
-  if (osdmap.name_pool.count(name) ||
-      pending_inc.new_pool_names.count(name)) {
+  if (osdmap.name_pool.count(name)) {
     return -EEXIST;
   }
+  for (map<int64_t,string>::iterator p = pending_inc.new_pool_names.begin();
+       p != pending_inc.new_pool_names.end();
+       ++p) {
+    if (p->second == name)
+      return -EEXIST;
+  }
 
   if (-1 == pending_inc.new_pool_max)
     pending_inc.new_pool_max = osdmap.pool_max;