From 2a078b2e5d6426142788a8eced11ac0708e21f56 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Wed, 26 Jun 2019 13:22:37 -0700 Subject: [PATCH] rgw: add pool to uinfo cache keys To differentiate between the different uinfo cache indexes Signed-off-by: Yehuda Sadeh --- src/rgw/services/svc_user_rados.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/rgw/services/svc_user_rados.cc b/src/rgw/services/svc_user_rados.cc index d6d29b881b7..6c4af55ae5b 100644 --- a/src/rgw/services/svc_user_rados.cc +++ b/src/rgw/services/svc_user_rados.cc @@ -491,8 +491,9 @@ int RGWSI_User_RADOS::get_user_info_from_index(RGWSI_MetaBackend::Context *_ctx, { RGWSI_MetaBackend_SObj::Context_SObj *ctx = static_cast(_ctx); -#warning uinfo_cache needs to add index to lookup - if (auto e = uinfo_cache->find(key)) { + string cache_key = pool.to_str() + "/" + key; + + if (auto e = uinfo_cache->find(cache_key)) { *info = e->info; if (objv_tracker) *objv_tracker = e->objv_tracker; @@ -526,7 +527,7 @@ int RGWSI_User_RADOS::get_user_info_from_index(RGWSI_MetaBackend::Context *_ctx, return -EIO; } - uinfo_cache->put(svc.cache, key, &e, { &cache_info }, y); + uinfo_cache->put(svc.cache, cache_key, &e, { &cache_info }, y); *info = e.info; if (objv_tracker) -- 2.39.5