From: Soumya Koduri <skoduri@redhat.com>
Date: Tue, 16 May 2023 10:10:36 +0000 (+0530)
Subject: rgw/multisite: Fix issue with parsing replication rules
X-Git-Tag: v17.2.8~247^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=11f58cd52d5d221eb22bf4dd164090ff87e8579c;p=ceph.git

rgw/multisite: Fix issue with parsing replication rules

Signed-off-by: Soumya Koduri <skoduri@redhat.com>
(cherry picked from commit 570de795721d13ddd6d39e28416b6d6f48477501)
(cherry picked from commit 25ca69b29449e79ef45e41e653e1bd0921cf7333)
---

diff --git a/src/rgw/services/svc_bucket_sync_sobj.cc b/src/rgw/services/svc_bucket_sync_sobj.cc
index 87a2372488c..0b086d0d19d 100644
--- a/src/rgw/services/svc_bucket_sync_sobj.cc
+++ b/src/rgw/services/svc_bucket_sync_sobj.cc
@@ -271,14 +271,10 @@ static bool diff_sets(std::set<rgw_bucket>& orig_set,
       ++oiter;
       ++niter;
       continue;
-    }
-    while (*oiter < *niter &&
-	   oiter != orig_set.end()) {
+    } else if (*oiter < *niter) {
       removed->push_back(*oiter);
       ++oiter;
-    }
-    while (*niter < *oiter
-	   && niter != new_set.end()) {
+    } else {
       added->push_back(*niter);
       ++niter;
     }