Merge pull request ceph#59536 from smanjara/rgw-full-sync-cr

rg/multisite: handle errors properly in RGWDataFullSyncSingleEntryCR()

Reviewed-by: Casey Bodley <[email protected]>

Author: cbodley

src/rgw/driver/rados/rgw_data_sync.cc

@@ -1702,8 +1702,12 @@ class RGWDataFullSyncSingleEntryCR : public RGWCoroutine {
                       lease_cr, bucket_shard_cache, nullptr, error_repo, tn, false);
           tn->log(10, SSTR("full sync: syncing shard_id " << sid << " of gen " << each->gen));
           if (first_shard) {
-            yield call(shard_cr);
             first_shard = false;
+            yield call(shard_cr);
+            if (retcode < 0) {
+              drain_all();
+              return set_cr_error(retcode);
+            }
           } else {
             yield_spawn_window(shard_cr, sc->lcc.adj_concurrency(cct->_conf->rgw_data_sync_spawn_window),
                               [&](uint64_t stack_id, int ret) {
@@ -1862,12 +1866,7 @@ class RGWDataFullSyncShardCR : public RGWDataBaseSyncShardCR {
 				 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;
         }
@@ -2551,6 +2550,7 @@ class RGWDataSyncCR : public RGWCoroutine {
       }
 
       notify_stack->cancel();
+      drain_all();
 
       return set_cr_done();
     }