RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw: fix list bucket with delimiter wrongly skip some special keys

Browse Source 
list with delimiter will skip subfile with directory + after_delim_s,
but the code wrongly add after_delim_s to next marker regardless it have directory

Fixes: http://tracker.ceph.com/issues/40905

Signed-off-by: Tianshan Qu <tianshan@xsky.com>
This commit is contained in:
Tianshan Qu 2019-07-23 21:50:15 +08:00
parent 3f18ed55aa
commit bc82637f54
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/rgw/rgw_rados.cc
View File

@ -2446,15 +2446,6 @@ int RGWRados::Bucket::List::list_objects_ordered(int64_t max_p,
string skip_after_delim;
while (truncated && count <= max) {
if (skip_after_delim > cur_marker.name) {
cur_marker = skip_after_delim;
ldout(cct, 20) << "setting cur_marker="
<< cur_marker.name
<< "[" << cur_marker.instance << "]"
<< dendl;
}
ent_map_t ent_map;
ent_map.reserve(read_ahead);
int r = store->cls_bucket_list_ordered(target->get_bucket_info(),
@ -2538,14 +2529,6 @@ int RGWRados::Bucket::List::list_objects_ordered(int64_t max_p,
next_marker = prefix_key;
(*common_prefixes)[prefix_key] = true;
int marker_delim_pos = cur_marker.name.find(
params.delim, cur_prefix.size());
skip_after_delim = cur_marker.name.substr(0, marker_delim_pos);
skip_after_delim.append(after_delim_s);
ldout(cct, 20) << "skip_after_delim=" << skip_after_delim << dendl;
count++;
}
@ -2561,6 +2544,24 @@ int RGWRados::Bucket::List::list_objects_ordered(int64_t max_p,
result->emplace_back(std::move(entry));
count++;
}
if (!params.delim.empty()) {
int marker_delim_pos = cur_marker.name.find(params.delim, cur_prefix.size());
if (marker_delim_pos >= 0) {
skip_after_delim = cur_marker.name.substr(0, marker_delim_pos);
skip_after_delim.append(after_delim_s);
ldout(cct, 20) << "skip_after_delim=" << skip_after_delim << dendl;
if (skip_after_delim > cur_marker.name) {
cur_marker = skip_after_delim;
ldout(cct, 20) << "setting cur_marker="
<< cur_marker.name
<< "[" << cur_marker.instance << "]"
<< dendl;
}
}
}
}
done: