From 595aeb542c1ace5829e94730f99c49b94257d9bd Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Tue, 26 Sep 2023 11:44:23 -0400 Subject: [PATCH] rgw/multisite: call drain before flushing markers in incremental sync Signed-off-by: Shilpa Jagannath --- src/rgw/driver/rados/rgw_data_sync.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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); } -- 2.47.3