rgw/multisite: Fix issue with parsing replication rules

Signed-off-by: Soumya Koduri <skoduri@redhat.com> (cherry picked from commit 570de79) (cherry picked from commit 25ca69b)
ceph · May 29, 2023 · 6f9eedf · 6f9eedf
1 parent 8fe7413
commit 6f9eedf
Showing 1 changed file with 2 additions and 6 deletions.
diff --git 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;
     }