From d2a67282e0ffd130a6e5d9c2886fcb209203ec08 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 20 Apr 2015 16:00:34 -0700 Subject: [PATCH] rgw: don't use end_marker for namespaced object listing Fixes: #11437 Don't deal with end_marker if there's a namespace set for the object listing. The cur_end_marker.empty() check is incorrect if no end_marker is provided, but a namespace is set. Just avoid this issue entirely, as it's not needed. Signed-off-by: Yehuda Sadeh --- src/rgw/rgw_rados.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 485d172c2a74..30af667193b1 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2347,7 +2347,9 @@ int RGWRados::Bucket::List::list_objects(int max, vector *result, end_marker_obj.set_ns(params.ns); end_marker_obj.set_obj(params.end_marker.name); rgw_obj_key cur_end_marker; - end_marker_obj.get_index_key(&cur_end_marker); + if (params.ns.empty()) { /* no support for end marker for namespaced objects */ + end_marker_obj.get_index_key(&cur_end_marker); + } const bool cur_end_marker_valid = !cur_end_marker.empty(); prefix_obj.set_ns(params.ns); -- 2.47.3