]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw/multisite: remove redundant drain_all_cb() call
authorShilpa Jagannath <smanjara@redhat.com>
Thu, 4 Aug 2022 14:23:33 +0000 (10:23 -0400)
committerAdam C. Emerson <aemerson@redhat.com>
Mon, 8 Aug 2022 19:44:15 +0000 (15:44 -0400)
Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>
src/rgw/rgw_data_sync.cc

index d75f55f1a518695c64474eda1f21672ff6e77f62..78d3dc222ca9f58d49470de413fbf91fcced57dc 100644 (file)
@@ -1341,8 +1341,8 @@ public:
           progress = ceph::real_time{};
 
           ldout(cct, 4) << "starting sync on " << bucket_shard_str{state->key.first}
-              << ' ' << *state->obligation << "progress timestamp " << state->progress_timestamp
-              << "progress " << progress << dendl;
+              << ' ' << *state->obligation << " progress timestamp " << state->progress_timestamp
+              << " progress " << progress << dendl;
           yield call(new RGWRunBucketSourcesSyncCR(sc, lease_cr,
                                                    state->key.first, tn,
                                                    state->obligation->gen,
@@ -1609,13 +1609,6 @@ public:
               });
       }
 
-      drain_all_cb([&](uint64_t stack_id, int ret) {
-        if (ret < 0) {
-          tn->log(10, SSTR("a sync operation returned error: " << ret));
-        }
-        return ret;
-      });
-
       yield call(marker_tracker->finish(key));
 
       return set_cr_done();