]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: add pool namespace to cache's key so that system obj can have unique 14125/head
authorZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Fri, 24 Mar 2017 10:31:32 +0000 (18:31 +0800)
committerZhang Shaowen <zhangshaowen@cmss.chinamobile.com>
Wed, 29 Mar 2017 00:51:48 +0000 (08:51 +0800)
key name.

Fixes: http://tracker.ceph.com/issues/19372
Signed-off-by: Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
src/rgw/rgw_cache.h

index cc07f0c8679efff55f581916d0948b1580abee3d..32068d39073e50a25883d5d6e6db661a722a4eb9 100644 (file)
@@ -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;
   }