From: Sage Weil <sage@inktank.com>
Date: Sat, 30 Jun 2012 02:54:35 +0000 (-0700)
Subject: osd: handle pool name changes properly
X-Git-Tag: v0.48argonaut~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5a9355091296121823156de7d3160de45328a0cc;p=ceph.git

osd: handle pool name changes properly

 * Remove the old name from the name->id map.

Fixes: #2676
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 297bb7fc2e1e..a6bca13b1b0c 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -688,6 +688,8 @@ int OSDMap::apply_incremental(Incremental &inc)
   for (map<int64_t,string>::iterator p = inc.new_pool_names.begin();
        p != inc.new_pool_names.end();
        p++) {
+    if (pool_name.count(p->first))
+      name_pool.erase(pool_name[p->first]);
     pool_name[p->first] = p->second;
     name_pool[p->second] = p->first;
   }