]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/multisite: capture retcode from RGWDataFullSyncSingleEntryCR() 51493/head
authorShilpa Jagannath <smanjara@redhat.com>
Wed, 14 Jun 2023 23:52:35 +0000 (19:52 -0400)
committerShilpa Jagannath <smanjara@redhat.com>
Fri, 30 Jun 2023 00:39:53 +0000 (20:39 -0400)
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
src/rgw/driver/rados/rgw_data_sync.cc

index 8c6fee7c9541175b023f181cb3b5f75f8d2a13b1..090e7a4ff449c088eeb1652501b7f5c54f46ccf4 100644 (file)
@@ -1838,13 +1838,21 @@ public:
                                 error_repo, entry_timestamp, lease_cr,
                                 bucket_shard_cache, &*marker_tracker, tn),
                               sc->lcc.adj_concurrency(cct->_conf->rgw_data_sync_spawn_window),
-                              std::nullopt);
+                              [&](uint64_t stack_id, int ret) {
+                                if (ret < 0) {
+                                  retcode = ret;
+                                }
+                                return retcode;
+                                });
           }
-         sync_marker.marker = iter->first;
+          sync_marker.marker = iter->first;
         }
+
       } while (omapvals->more);
       omapvals.reset();
 
+      drain_all();
+
       tn->unset_flag(RGW_SNS_FLAG_ACTIVE);
 
       if (lost_bid) {