From: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Date: Fri, 24 Mar 2017 10:31:32 +0000 (+0800)
Subject: rgw: add pool namespace to cache's key so that system obj can have unique
X-Git-Tag: v12.0.2~205^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14125%2Fhead;p=ceph.git

rgw: add pool namespace to cache's key so that system obj can have unique
key name.

Fixes: http://tracker.ceph.com/issues/19372

Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
---

diff --git a/src/rgw/rgw_cache.h b/src/rgw/rgw_cache.h
index cc07f0c8679e..32068d39073e 100644
--- a/src/rgw/rgw_cache.h
+++ b/src/rgw/rgw_cache.h
@@ -182,8 +182,8 @@ class RGWCache  : public T
 
   string normal_name(rgw_pool& pool, const std::string& oid) {
     std::string buf;
-    buf.reserve(pool.name.size() + oid.size() + 2);
-    buf.append(pool.name).append("+").append(oid);
+    buf.reserve(pool.name.size() + pool.ns.size() + oid.size() + 2);
+    buf.append(pool.name).append("+").append(pool.ns).append("+").append(oid);
     return buf;
   }