From 90030061961576de3acb3b7c9235c13de860d13f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Tue, 28 Jan 2020 14:15:44 -0500 Subject: [PATCH] qa/rgw: multisite checkpoints consider pubsub zone pubsub zones are configured to only sync_from the master zone, so bucket checkpoints should ignore its sync status with respect to other zones Fixes: https://tracker.ceph.com/issues/43768 Signed-off-by: Casey Bodley --- src/test/rgw/rgw_multi/multisite.py | 3 +++ src/test/rgw/rgw_multi/tests.py | 4 ++-- src/test/rgw/rgw_multi/zone_ps.py | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/test/rgw/rgw_multi/multisite.py b/src/test/rgw/rgw_multi/multisite.py index f189a5078397..a0a53fe4d5f0 100644 --- a/src/test/rgw/rgw_multi/multisite.py +++ b/src/test/rgw/rgw_multi/multisite.py @@ -164,6 +164,9 @@ class Zone(SystemObject, SystemObject.CreateDelete, SystemObject.GetSet, SystemO def tier_type(self): raise NotImplementedError + def syncs_from(self, zone_name): + return zone_name != self.name + def has_buckets(self): return True diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index 31b8233c0316..911eaf0dcacc 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -354,7 +354,7 @@ def compare_bucket_status(target_zone, source_zone, bucket_name, log_status, syn return True def zone_data_checkpoint(target_zone, source_zone): - if target_zone == source_zone: + if not target_zone.syncs_from(source_zone): return log_status = data_source_log_status(source_zone) @@ -384,7 +384,7 @@ def zonegroup_data_checkpoint(zonegroup_conns): zone_data_checkpoint(target_conn.zone, source_conn.zone) def zone_bucket_checkpoint(target_zone, source_zone, bucket_name): - if target_zone == source_zone: + if not target_zone.syncs_from(source_zone): return log_status = bucket_source_log_status(source_zone, bucket_name) diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py index 090fbc789fc2..0034e8bb986e 100644 --- a/src/test/rgw/rgw_multi/zone_ps.py +++ b/src/test/rgw/rgw_multi/zone_ps.py @@ -49,6 +49,9 @@ class PSZone(Zone): # pylint: disable=too-many-ancestors def tier_type(self): return "pubsub" + def syncs_from(self, zone_name): + return zone_name == self.master_zone.name + def create(self, cluster, args=None, **kwargs): if args is None: args = '' -- 2.47.3