From: Nizamudeen A Date: Wed, 25 Sep 2024 04:32:57 +0000 (+0530) Subject: Merge pull request #59820 from rhcs-dashboard/rgw-multisite-sync-policy-improvements X-Git-Tag: v20.0.0~984 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=4ebcd01c60993a47d9cea11611a02a18d0918f5c;p=ceph.git Merge pull request #59820 from rhcs-dashboard/rgw-multisite-sync-policy-improvements mgr/dashboard: multisite sync policy improvements Reviewed-by: afreen23 Reviewed-by: Nizamudeen A --- 4ebcd01c60993a47d9cea11611a02a18d0918f5c diff --cc src/pybind/mgr/dashboard/services/rgw_client.py index 6822a4e239ff8,00b052c2d167d..62699c5a7c572 --- a/src/pybind/mgr/dashboard/services/rgw_client.py +++ b/src/pybind/mgr/dashboard/services/rgw_client.py @@@ -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)