Merge "Fix scale-out in the multi-site replication scenario"

canonical · Apr 29, 2024 · f8a9cc4 · f8a9cc4
2 parents a4a84b7 + 6e7caaa
commit f8a9cc4
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/ceph-radosgw/hooks/utils.py b/ceph-radosgw/hooks/utils.py
@@ -246,8 +246,9 @@ def check_optional_config_and_relations(configs):
         # Primary site status check
         if primary_rids:
             # Migration: The system is not multisite already.
-            if not multisite.is_multisite_configured(config('zone'),
-                                                     config('zonegroup')):
+            if (ready_for_service(legacy=False) and
+                not multisite.is_multisite_configured(config('zone'),
+                                                      config('zonegroup'))):
                 if multisite.check_cluster_has_buckets():
                     zones, zonegroups = get_zones_zonegroups()
                     status_msg = "Multiple zone or zonegroup configured, " \
@@ -271,8 +272,9 @@ def check_optional_config_and_relations(configs):
         # Secondary site status check
         if secondary_rids:
             # Migration: The system is not multisite already.
-            if not multisite.is_multisite_configured(config('zone'),
-                                                     config('zonegroup')):
+            if (ready_for_service(legacy=False) and
+                not multisite.is_multisite_configured(config('zone'),
+                                                      config('zonegroup'))):
                 if multisite.check_cluster_has_buckets():
                     return ('blocked',
                             "Non-Pristine RGW site can't be used as secondary")