Skip to content

Commit 766b7a1

Browse files
committed
rgw: metadata and data sync fairness notifications to retry upon any error case
This is a complementary fix to the earlier one described at ceph#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 <[email protected]>
1 parent 0da9145 commit 766b7a1

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/rgw/driver/rados/rgw_data_sync.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2404,8 +2404,7 @@ class RGWDataSyncShardNotifyCR : public RGWCoroutine {
24042404
set_status("sync lock notification");
24052405
yield call(sync_env->bid_manager->notify_cr());
24062406
if (retcode < 0) {
2407-
tn->log(5, SSTR("ERROR: failed to notify bidding information" << retcode));
2408-
return set_cr_error(retcode);
2407+
tn->log(5, SSTR("ERROR: failed to notify bidding information retcode=" << retcode));
24092408
}
24102409

24112410
set_status("sleeping");

src/rgw/driver/rados/rgw_sync.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,8 +1996,7 @@ class RGWMetaSyncShardNotifyCR : public RGWCoroutine {
19961996
set_status("sync lock notification");
19971997
yield call(sync_env->bid_manager->notify_cr());
19981998
if (retcode < 0) {
1999-
tn->log(5, SSTR("ERROR: failed to notify bidding information" << retcode));
2000-
return set_cr_error(retcode);
1999+
tn->log(5, SSTR("ERROR: failed to notify bidding information retcode=" << retcode));
20012000
}
20022001

20032002
set_status("sleeping");

0 commit comments

Comments
 (0)