From: Seena Fallah <seenafallah@gmail.com>
Date: Mon, 4 Nov 2024 17:26:55 +0000 (+0100)
Subject: Revert "rgw/multisite: avoid redundant error repo entry logging"
X-Git-Tag: v20.0.0~607^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F60589%2Fhead;p=ceph.git

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.
---

diff --git a/src/rgw/driver/rados/rgw_data_sync.cc b/src/rgw/driver/rados/rgw_data_sync.cc
index d5437f548c18..792671579b74 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