From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 25 Apr 2019 13:51:35 +0000 (-0400)
Subject: rgw: fix end condition in AsyncMetadataList for bilog trim
X-Git-Tag: v14.2.5~110^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2ccdbd3f2c0642125e7e5920760d521cd885e0a7;p=ceph.git

rgw: fix end condition in AsyncMetadataList for bilog trim

the metadata listing does not include the start_marker, so we need to
include it at the end if we looped all the way around

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

diff --git a/src/rgw/rgw_sync_log_trim.cc b/src/rgw/rgw_sync_log_trim.cc
index 53aa8e10aa9..686d21e80a6 100644
--- a/src/rgw/rgw_sync_log_trim.cc
+++ b/src/rgw/rgw_sync_log_trim.cc
@@ -665,7 +665,7 @@ int AsyncMetadataList::_send_request()
       ceph_assert(keys.size() == 1);
       auto& key = keys.front();
       // stop at original marker
-      if (marker >= start_marker) {
+      if (marker > start_marker) {
         return 0;
       }
       if (!callback(std::move(key), std::move(marker))) {