From: Shilpa Jagannath Date: Mon, 9 Sep 2024 19:55:13 +0000 (-0400) Subject: rgw/multisite: no need to capture error from callback. we are already doing that... X-Git-Tag: testing/wip-khiremat-testing-20250424.121018-squid-debug~28^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=936099af41d7f87388b463741612a30eacd09ffc;p=ceph-ci.git rgw/multisite: no need to capture error from callback. we are already doing that within RGWDataFullSyncSingleEntryCR() Signed-off-by: Shilpa Jagannath (cherry picked from commit 34f8306fe5c1bfb90c57f2453a0624af4c2ac6c7) Fixes: https://tracker.ceph.com/issues/68298 Signed-off-by: Adam C. Emerson --- diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc index 5d3d967de55..b4b725e5192 100644 --- a/src/rgw/driver/rados/rgw_data_sync.cc +++ b/src/rgw/driver/rados/rgw_data_sync.cc @@ -1866,12 +1866,7 @@ public: error_repo, entry_timestamp, lease_cr, bucket_shard_cache, &*marker_tracker, tn), sc->lcc.adj_concurrency(cct->_conf->rgw_data_sync_spawn_window), - [&](uint64_t stack_id, int ret) { - if (ret < 0) { - retcode = ret; - } - return retcode; - }); + std::nullopt); } sync_marker.marker = iter->first; }