From 96b6650d1ded1e227f4ad7d6245e509e47923b71 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Wed, 14 Jun 2023 19:52:35 -0400 Subject: [PATCH] rgw/multisite: capture retcode from RGWDataFullSyncSingleEntryCR() Signed-off-by: Shilpa Jagannath --- src/rgw/driver/rados/rgw_data_sync.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc index 8c6fee7c954..090e7a4ff44 100644 --- a/src/rgw/driver/rados/rgw_data_sync.cc +++ b/src/rgw/driver/rados/rgw_data_sync.cc @@ -1838,13 +1838,21 @@ public: error_repo, entry_timestamp, lease_cr, bucket_shard_cache, &*marker_tracker, tn), sc->lcc.adj_concurrency(cct->_conf->rgw_data_sync_spawn_window), - std::nullopt); + [&](uint64_t stack_id, int ret) { + if (ret < 0) { + retcode = ret; + } + return retcode; + }); } - sync_marker.marker = iter->first; + sync_marker.marker = iter->first; } + } while (omapvals->more); omapvals.reset(); + drain_all(); + tn->unset_flag(RGW_SNS_FLAG_ACTIVE); if (lost_bid) { -- 2.39.5