From b9c652a326a3268e6b429bb534e6ec665f6d4ee1 Mon Sep 17 00:00:00 2001 From: Tianshan Qu Date: Tue, 11 Jun 2019 12:27:12 +0800 Subject: [PATCH] rgw: always generate after delimiter char to skip directory the following code also need after_delim_s to skip directory after list 1000 objects Signed-off-by: Tianshan Qu (cherry picked from commit 8c6678387b00c862d71cffd6fed6ca6c236e3fb7) --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index ff7e5ac094280..ff491b40ff915 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2473,12 +2473,12 @@ int RGWRados::Bucket::List::list_objects_ordered( string after_delim_s; /* needed in !params.delim.empty() AND later */ if (!params.delim.empty()) { + after_delim_s = after_delim(params.delim); /* if marker points at a common prefix, fast forward it into its * upper bound string */ int delim_pos = cur_marker.name.find(params.delim, cur_prefix.size()); if (delim_pos >= 0) { string s = cur_marker.name.substr(0, delim_pos); - after_delim_s = after_delim(params.delim); s.append(after_delim_s); cur_marker = s; } -- 2.39.5