]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/multisite: drain children before collect() returns error in RGWInitDataSyncStatus... 66466/head
authorShilpa Jagannath <smanjara@redhat.com>
Mon, 1 Dec 2025 20:56:46 +0000 (15:56 -0500)
committerShilpa Jagannath <smanjara@redhat.com>
Mon, 1 Dec 2025 20:56:46 +0000 (15:56 -0500)
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
src/rgw/driver/rados/rgw_data_sync.cc

index bb95f6bd0ef8d2f706ecb7683b69a7a373c590b7..76262d7d0bd6b12a4d80dceab1cdcf1e31b83682 100644 (file)
@@ -635,7 +635,8 @@ public:
       while (collect(&ret, NULL)) {
         if (ret < 0) {
           tn->log(0, SSTR("ERROR: failed to read remote data log shards"));
-          return set_state(RGWCoroutine_Error);
+          drain_all();
+          return set_cr_error(ret);
         }
         yield;
       }
@@ -657,7 +658,8 @@ public:
       while (collect(&ret, NULL)) {
         if (ret < 0) {
           tn->log(0, SSTR("ERROR: failed to write data sync status markers"));
-          return set_state(RGWCoroutine_Error);
+          drain_all();
+          return set_cr_error(ret);
         }
         yield;
       }