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

rgw: escape prefix correctly when listing objects

Browse Source 
Fixes: 
When listing objects prefix needs to be escaped correctly (the
same as with the marker). Otherwise listing objects with prefix
that starts with underscore doesn't work.
Backport: bobtail, cuttlefish

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
This commit is contained in:
Yehuda Sadeh 2013-06-14 14:53:54 -07:00 committed by Greg Farnum
parent b7143c2f84
commit d582ee2438
1 changed files with 6 additions and 2 deletions

8
src/rgw/rgw_rados.cc
View File

@ -735,14 +735,18 @@ int RGWRados::list_objects(rgw_bucket& bucket, int max, string& prefix, string&
}
result.clear();
rgw_obj marker_obj;
rgw_obj marker_obj, prefix_obj;
marker_obj.set_ns(ns);
marker_obj.set_obj(marker);
string cur_marker = marker_obj.object;
prefix_obj.set_ns(ns);
prefix_obj.set_obj(prefix);
string cur_prefix = prefix_obj.object;
do {
std::map<string, RGWObjEnt> ent_map;
int r = cls_bucket_list(bucket, cur_marker, prefix, max - count, ent_map,
int r = cls_bucket_list(bucket, cur_marker, cur_prefix, max - count, ent_map,
&truncated, &cur_marker);
if (r < 0)
return r;