RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-01 23:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

cls_statelog: fix a few issues

Browse Source 
Issues that came up when developed the unitest

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-06-18 15:13:43 -07:00
parent e2af5fbe25
commit b89f47c84f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/cls/statelog/cls_statelog.cc
View File

@ -43,8 +43,8 @@ static int write_statelog_entry(cls_method_context_t hctx, const string& index,
static void get_index_by_client(const string& client_id, const string& op_id, string& index) static void get_index_by_client(const string& client_id, const string& op_id, string& index)
{ {
string s = statelog_index_by_client_prefix + "_"; index = statelog_index_by_client_prefix;
s.append(client_id + "_" + op_id); index.append(client_id + "_" + op_id);
} }
static void get_index_by_client(cls_statelog_entry& entry, string& index) static void get_index_by_client(cls_statelog_entry& entry, string& index)
@ -57,7 +57,7 @@ static void get_index_by_object(const string& object, const string& op_id, strin
char buf[16]; char buf[16];
snprintf(buf, sizeof(buf), "%d_", (int)object.size()); snprintf(buf, sizeof(buf), "%d_", (int)object.size());
index = statelog_index_by_object_prefix + "_" + buf + "_"; /* append object length to ensure uniqueness */ index = statelog_index_by_object_prefix + buf; /* append object length to ensure uniqueness */
index.append(object + "_" + op_id); index.append(object + "_" + op_id);
} }
@ -163,10 +163,12 @@ static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferli
string from_index; string from_index;
string match_prefix; string match_prefix;
if (op.object.empty()) { if (!op.client_id.empty()) {
get_index_by_client(op.client_id, op.op_id, match_prefix); get_index_by_client(op.client_id, op.op_id, match_prefix);
} else { } else if (!op.object.empty()) {
get_index_by_object(op.object, op.op_id, match_prefix); get_index_by_object(op.object, op.op_id, match_prefix);
} else {
match_prefix = statelog_index_by_object_prefix;
} }
if (op.marker.empty()) { if (op.marker.empty()) {
@ -184,6 +186,7 @@ static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferli
if (rc < 0) if (rc < 0)
return rc; return rc;
CLS_LOG(0, "%s: %d from_index=%s match_prefix=%s", __FILE__, __LINE__, from_index.c_str(), match_prefix.c_str());
cls_statelog_list_ret ret; cls_statelog_list_ret ret;
list<cls_statelog_entry>& entries = ret.entries; list<cls_statelog_entry>& entries = ret.entries;
@ -196,6 +199,7 @@ static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferli
for (i = 0; i < max_entries && iter != keys.end(); ++i, ++iter) { for (i = 0; i < max_entries && iter != keys.end(); ++i, ++iter) {
const string& index = iter->first; const string& index = iter->first;
marker = index; marker = index;
CLS_LOG(0, "%s: %d index=%s", __FILE__, __LINE__, index.c_str());
bufferlist& bl = iter->second; bufferlist& bl = iter->second;
bufferlist::iterator biter = bl.begin(); bufferlist::iterator biter = bl.begin();