From: Shilpa Jagannath <smanjara@redhat.com>
Date: Tue, 26 Sep 2023 15:44:23 +0000 (-0400)
Subject: rgw/multisite: call drain before flushing markers in incremental sync
X-Git-Tag: v19.0.0~369^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F53676%2Fhead;p=ceph.git

rgw/multisite: call drain before flushing markers in incremental sync

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
---

diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
index 090e7a4ff449..bbd3aaf448da 100644
--- a/src/rgw/driver/rados/rgw_data_sync.cc
+++ b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -2121,11 +2121,12 @@ public:
 	}
       } while (true);
 
+      drain_all();
+      yield marker_tracker->flush();
+
       if (lost_bid) {
         return set_cr_error(-EBUSY);
       } else if (lost_lock) {
-        drain_all();
-        yield marker_tracker->flush();
         return set_cr_error(-ECANCELED);
       }