]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #59820 from rhcs-dashboard/rgw-multisite-sync-policy-improvements
authorNizamudeen A <nia@redhat.com>
Wed, 25 Sep 2024 04:32:57 +0000 (10:02 +0530)
committerGitHub <noreply@github.com>
Wed, 25 Sep 2024 04:32:57 +0000 (10:02 +0530)
mgr/dashboard: multisite sync policy improvements

Reviewed-by: afreen23 <NOT@FOUND>
Reviewed-by: Nizamudeen A <nia@redhat.com>
1  2 
src/pybind/mgr/dashboard/services/rgw_client.py

index 6822a4e239ff82586e7c02b778c1cec725ec50be,00b052c2d167dce068672432a804e841ba780d68..62699c5a7c5726475964565f8935e04760b3c78f
@@@ -2198,10 -2173,9 +2198,11 @@@ class RgwMultisite
                                               http_status_code=500, component='rgw')
              except SubprocessError as error:
                  raise DashboardException(error, http_status_code=500, component='rgw')
 +            if not bucket_name and update_period:
 +                self.update_period()
  
-         if source_zones['removed'] or destination_zones['removed']:
+         if ((source_zones['removed'] and '*' not in source_zones['added'])
+                 or (destination_zones['removed'] and '*' not in destination_zones['added'])):
              self.remove_sync_pipe(group_id, pipe_id, source_zones['removed'],
                                    destination_zones['removed'], destination_bucket,
                                    bucket_name)