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 090e7a4ff449c088eeb1652501b7f5c54f46ccf4..bbd3aaf448dad2bf95a16df40d67f30f5a7545b5 100644 (file)
--- 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);
       }