From 0d9ee21d0714b2f347e0794b107957b2ae689f94 Mon Sep 17 00:00:00 2001 From: Oguzhan Ozmen Date: Fri, 11 Apr 2025 21:45:19 +0000 Subject: [PATCH] rgw: metadata and data sync fairness notifications to retry upon any error case This is a complementary fix to the earlier one described at #62156. When the sync shard notification fails due to any failures including timeout, this change keeps the loop going for both metadata and data sync. Fixes https://tracker.ceph.com/issues/70270 Signed-off-by: Oguzhan Ozmen (cherry picked from commit 766b7a14315ae7ca9645b462ee774570caeff64c) --- src/rgw/driver/rados/rgw_data_sync.cc | 3 +-- src/rgw/driver/rados/rgw_sync.cc | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc index dbea56d4de7..2c7a48a1edd 100644 --- a/src/rgw/driver/rados/rgw_data_sync.cc +++ b/src/rgw/driver/rados/rgw_data_sync.cc @@ -2364,8 +2364,7 @@ public: set_status("sync lock notification"); yield call(sync_env->bid_manager->notify_cr()); if (retcode < 0) { - tn->log(5, SSTR("ERROR: failed to notify bidding information" << retcode)); - return set_cr_error(retcode); + tn->log(5, SSTR("ERROR: failed to notify bidding information retcode=" << retcode)); } set_status("sleeping"); diff --git a/src/rgw/driver/rados/rgw_sync.cc b/src/rgw/driver/rados/rgw_sync.cc index 583e2d1098e..62211fa6c16 100644 --- a/src/rgw/driver/rados/rgw_sync.cc +++ b/src/rgw/driver/rados/rgw_sync.cc @@ -1996,8 +1996,7 @@ public: set_status("sync lock notification"); yield call(sync_env->bid_manager->notify_cr()); if (retcode < 0) { - tn->log(5, SSTR("ERROR: failed to notify bidding information" << retcode)); - return set_cr_error(retcode); + tn->log(5, SSTR("ERROR: failed to notify bidding information retcode=" << retcode)); } set_status("sleeping"); -- 2.39.5