From cb2ea51138a9760c65ecc16a6108f05db9dc12e5 Mon Sep 17 00:00:00 2001 From: Zhang Shaowen Date: Fri, 24 Mar 2017 18:31:32 +0800 Subject: [PATCH] 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 --- src/rgw/rgw_cache.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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; } -- 2.47.3