]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/rados: fix list_objects_ordered() detection of "forward progress"
authorCasey Bodley <cbodley@redhat.com>
Tue, 11 Mar 2025 16:51:02 +0000 (12:51 -0400)
committerCasey Bodley <cbodley@redhat.com>
Mon, 31 Mar 2025 21:03:02 +0000 (17:03 -0400)
for multiple versions of the same object name, ListObjectVersions is
supposed to return versions "in the order that they were stored,
returning the most recently stored object first"

this sort order is preserved by the bucket index in cls_rgw, so
list_objects_ordered() should not expect the version ids to be sorted
lexicographically. replace the not-less-than comparison with equality

Signed-off-by: Casey Bodley <cbodley@redhat.com>
(cherry picked from commit 24f55b883e5009b032e1c0e91932a01d5d231945)

src/rgw/driver/rados/rgw_rados.cc

index a1370b079dc6b81c058dca98c7e2a3510d63e1a5..8b6b9b05e55d490198381f53dd3b903598db3723 100644 (file)
@@ -1859,7 +1859,7 @@ int RGWRados::Bucket::List::list_objects_ordered(
     ldpp_dout(dpp, 20) << __func__ <<
       ": starting attempt " << attempt << dendl;
 
-    if (attempt > 1 && !(prev_marker < cur_marker)) {
+    if (attempt > 1 && prev_marker == cur_marker) {
       // we've failed to make forward progress
       ldpp_dout(dpp, 0) << "ERROR: " << __func__ <<
        " marker failed to make forward progress; attempt=" << attempt <<