diff options
| author | Seena Fallah <seenafallah@gmail.com> | 2024-11-04 18:26:55 +0100 |
|---|---|---|
| committer | Seena Fallah <seenafallah@gmail.com> | 2024-11-04 18:26:55 +0100 |
| commit | f07c4d47f1925f874800a208d2bbdcbd6761c22d (patch) | |
| tree | 87044e6017967bd62f60e5bfec8cb5302a7615cf | |
| parent | Merge pull request #60584 from zdover23/wip-doc-2024-11-01-whereas (diff) | |
| download | ceph-f07c4d47f1925f874800a208d2bbdcbd6761c22d.tar.xz ceph-f07c4d47f1925f874800a208d2bbdcbd6761c22d.zip | |
Revert "rgw/multisite: avoid redundant error repo entry logging"
In order to keep the order of processing the generations, when the
requested gen is higher than the current gen we log both into the
error repo and process them in order again later.
Fixes: https://tracker.ceph.com/issues/68805
Signed-off-by: Seena Fallah <seenafallah@gmail.com>
This reverts commit a191f9a6d2997f655f580e16731615e77350a03d.
| -rw-r--r-- | src/rgw/driver/rados/rgw_data_sync.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc index d5437f548c1..792671579b7 100644 --- a/src/rgw/driver/rados/rgw_data_sync.cc +++ b/src/rgw/driver/rados/rgw_data_sync.cc @@ -6052,13 +6052,12 @@ int RGWSyncBucketCR::operate(const DoutPrefixProvider *dpp) } else { tn->log(20, SSTR("logged prev gen entry (bucket=" << source_bs.bucket << ", shard_id=" << source_bs.shard_id << ", gen=" << current_gen << " in error repo: retcode=" << retcode)); } - } else { + } retcode = -EAGAIN; tn->log(10, SSTR("ERROR: requested sync of future generation " << *gen << " > " << current_gen << ", returning " << retcode << " for later retry")); return set_cr_error(retcode); - } } else if (*gen < current_gen) { tn->log(10, SSTR("WARNING: requested sync of past generation " << *gen << " < " << current_gen |