RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

cls_rgw: use updated internal omap api

Browse Source 
These were changed by 23ebc093a6.

Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2012-06-12 11:28:04 -07:00
parent 6fd80d3e56
commit 37dea2d8db
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/cls_rgw.cc
View File

@ -473,7 +473,7 @@ int rgw_user_usage_log_add(cls_method_context_t hctx, bufferlist *in, bufferlist
CLS_LOG(10, "rgw_user_usage_log_add user=%s bucket=%s\n", entry.owner.c_str(), entry.bucket.c_str());
bufferlist record_bl;
int ret = cls_cxx_map_read_key(hctx, key_by_time, &record_bl);
int ret = cls_cxx_map_get_val(hctx, key_by_time, &record_bl);
if (ret < 0 && ret != -ENOENT) {
CLS_LOG(1, "ERROR: rgw_user_usage_log_add(): cls_cxx_map_read_key returned %d\n", ret);
return -EINVAL;
@ -489,13 +489,13 @@ int rgw_user_usage_log_add(cls_method_context_t hctx, bufferlist *in, bufferlist
bufferlist new_record_bl;
::encode(entry, new_record_bl);
ret = cls_cxx_map_write_key(hctx, key_by_time, &new_record_bl);
ret = cls_cxx_map_set_val(hctx, key_by_time, &new_record_bl);
if (ret < 0)
return ret;
string key_by_user;
usage_record_name_by_user(entry.owner, entry.epoch, entry.bucket, key_by_user);
ret = cls_cxx_map_write_key(hctx, key_by_user, &new_record_bl);
ret = cls_cxx_map_set_val(hctx, key_by_user, &new_record_bl);
if (ret < 0)
return ret;
}
@ -539,7 +539,7 @@ static int usage_iterate_range(cls_method_context_t hctx, uint64_t start, uint64
}
do {
int ret = cls_cxx_map_read_keys(hctx, start_key, filter_prefix, NUM_KEYS, &keys);
int ret = cls_cxx_map_get_vals(hctx, start_key, filter_prefix, NUM_KEYS, &keys);
if (ret < 0)
return ret;