diff options
| author | Casey Bodley <cbodley@users.noreply.github.com> | 2023-12-07 16:05:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-12-07 16:05:47 +0100 |
| commit | 9cba1f1d5e08a0cb4414e1548b6dba796d21048d (patch) | |
| tree | 6623512878c50aa10a735f8a06e35d0350b1d27b /src/rgw/driver/rados/rgw_data_sync.cc | |
| parent | Merge pull request #54810 from mkogan1/rgw-wip-t63445-valg-supp-rb (diff) | |
| parent | rgw/multisite: correct the marker_tracker->flush() call and only (diff) | |
| download | ceph-9cba1f1d5e08a0cb4414e1548b6dba796d21048d.tar.xz ceph-9cba1f1d5e08a0cb4414e1548b6dba796d21048d.zip | |
Merge pull request #54278 from smanjara/wip-fix-rgw-full-sync
rgw/multisite: fix marker_tracker flush() call in incremental sync
Reviewed-by: Casey Bodley <cbodley@redhat.com>
Diffstat (limited to 'src/rgw/driver/rados/rgw_data_sync.cc')
| -rw-r--r-- | src/rgw/driver/rados/rgw_data_sync.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc index 0c74f80603a..7b273e68129 100644 --- a/src/rgw/driver/rados/rgw_data_sync.cc +++ b/src/rgw/driver/rados/rgw_data_sync.cc @@ -2122,9 +2122,9 @@ public: } while (true); drain_all(); - yield marker_tracker->flush(); if (lost_bid) { + yield call(marker_tracker->flush()); return set_cr_error(-EBUSY); } else if (lost_lock) { return set_cr_error(-ECANCELED); |