RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-28 13:49:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: cache decoded user info

Browse Source 
Instead of accessing the raw user info data, cache the decoded
structure.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2014-02-20 15:03:18 -08:00
parent 0b35e61bb1
commit eaff42f3e9
1 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/rgw/rgw_user.cc
View File

@ -6,6 +6,7 @@
#include "common/errno.h" #include "common/errno.h"
#include "common/Formatter.h" #include "common/Formatter.h"
#include "common/ceph_json.h" #include "common/ceph_json.h"
#include "common/RWLock.h"
#include "rgw_rados.h" #include "rgw_rados.h"
#include "rgw_acl.h" #include "rgw_acl.h"
@ -192,25 +193,64 @@ int rgw_store_user_info(RGWRados *store, RGWUserInfo& info, RGWUserInfo *old_inf
return ret; return ret;
} }
struct user_info_entry {
RGWUserInfo info;
RGWObjVersionTracker objv_tracker;
time_t mtime;
};
static map<string, user_info_entry> uinfo_cache;
static RWLock uinfo_lock("uinfo_lock");
int rgw_get_user_info_from_index(RGWRados *store, string& key, rgw_bucket& bucket, RGWUserInfo& info, int rgw_get_user_info_from_index(RGWRados *store, string& key, rgw_bucket& bucket, RGWUserInfo& info,
RGWObjVersionTracker *objv_tracker, time_t *pmtime) RGWObjVersionTracker *objv_tracker, time_t *pmtime)
{ {
bufferlist bl; bufferlist bl;
RGWUID uid; RGWUID uid;
int ret = rgw_get_system_obj(store, NULL, bucket, key, bl, NULL, pmtime); uinfo_lock.get_read();
map<string, user_info_entry>::iterator uiter = uinfo_cache.find(key);
if (uiter != uinfo_cache.end()) {
user_info_entry& e = uiter->second;
info = e.info;
if (objv_tracker)
*objv_tracker = e.objv_tracker;
if (pmtime)
*pmtime = e.mtime;
uinfo_lock.unlock();
return 0;
}
uinfo_lock.unlock();
user_info_entry e;
int ret = rgw_get_system_obj(store, NULL, bucket, key, bl, NULL, &e.mtime);
if (ret < 0) if (ret < 0)
return ret; return ret;
bufferlist::iterator iter = bl.begin(); bufferlist::iterator iter = bl.begin();
try { try {
::decode(uid, iter); ::decode(uid, iter);
return rgw_get_user_info_by_uid(store, uid.user_id, info, objv_tracker); int ret = rgw_get_user_info_by_uid(store, uid.user_id, e.info, &e.objv_tracker);
if (ret < 0) {
return ret;
}
} catch (buffer::error& err) { } catch (buffer::error& err) {
ldout(store->ctx(), 0) << "ERROR: failed to decode user info, caught buffer::error" << dendl; ldout(store->ctx(), 0) << "ERROR: failed to decode user info, caught buffer::error" << dendl;
return -EIO; return -EIO;
} }
uinfo_lock.get_write();
uinfo_cache[key] = e;
uinfo_lock.unlock();
info = e.info;
if (objv_tracker)
*objv_tracker = e.objv_tracker;
if (pmtime)
*pmtime = e.mtime;
return 0; return 0;
} }