Merge pull request ceph#62793 from BBoozmen/wip-oozmen-70270

cbodley · web-flow · commit 9392c9e9bec2 · 2025-04-17T12:00:27.000-04:00
rgw: metadata and data sync notification to retry upon any failure case

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
@@ -2404,8 +2404,7 @@ class RGWDataSyncShardNotifyCR : public RGWCoroutine {
         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
@@ -1996,8 +1996,7 @@ class RGWMetaSyncShardNotifyCR : public RGWCoroutine {
         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");

Original file line number	Diff line number	Diff line change
`@@ -2404,8 +2404,7 @@ class RGWDataSyncShardNotifyCR : public RGWCoroutine {`
`2404`	`2404`	`set_status("sync lock notification");`
`2405`	`2405`	`yield call(sync_env->bid_manager->notify_cr());`
`2406`	`2406`	`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));`
`2409`	`2408`	`}`
`2410`	`2409`
`2411`	`2410`	`set_status("sleeping");`
Original file line number	Diff line number	Diff line change
`@@ -1996,8 +1996,7 @@ class RGWMetaSyncShardNotifyCR : public RGWCoroutine {`
`1996`	`1996`	`set_status("sync lock notification");`
`1997`	`1997`	`yield call(sync_env->bid_manager->notify_cr());`
`1998`	`1998`	`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));`
`2001`	`2000`	`}`
`2002`	`2001`
`2003`	`2002`	`set_status("sleeping");`