From 824fce5521b1e3223767ae7e362aad77b1e48a3d Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Mon, 15 Apr 2024 10:54:57 -0400 Subject: [PATCH] qa/multisite: disable two-zonegroup and three-zone configs. Signed-off-by: Shilpa Jagannath (cherry picked from commit fb3186266ee52b352ebdf4ce394d3144a23db8f2) (cherry picked from commit 7f0ae8e03636cf81811b295f62fdb4a5fddafbf2) --- ...e-zones.yaml => three-zones.yaml.disabled} | 0 ...group.yaml => two-zonegroup.yaml.disabled} | 0 qa/suites/rgw/multisite/realms/two-zones.yaml | 4 ++-- src/test/rgw/rgw_multi/tests.py | 21 ++++++++++++++++--- 4 files changed, 20 insertions(+), 5 deletions(-) rename qa/suites/rgw/multisite/realms/{three-zones.yaml => three-zones.yaml.disabled} (100%) rename qa/suites/rgw/multisite/realms/{two-zonegroup.yaml => two-zonegroup.yaml.disabled} (100%) diff --git a/qa/suites/rgw/multisite/realms/three-zones.yaml b/qa/suites/rgw/multisite/realms/three-zones.yaml.disabled similarity index 100% rename from qa/suites/rgw/multisite/realms/three-zones.yaml rename to qa/suites/rgw/multisite/realms/three-zones.yaml.disabled diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled similarity index 100% rename from qa/suites/rgw/multisite/realms/two-zonegroup.yaml rename to qa/suites/rgw/multisite/realms/two-zonegroup.yaml.disabled diff --git a/qa/suites/rgw/multisite/realms/two-zones.yaml b/qa/suites/rgw/multisite/realms/two-zones.yaml index 3564c9619b7cb..1bea381077c00 100644 --- a/qa/suites/rgw/multisite/realms/two-zones.yaml +++ b/qa/suites/rgw/multisite/realms/two-zones.yaml @@ -8,7 +8,7 @@ overrides: is_master: true is_default: true endpoints: [c1.client.0] - enabled_features: ['resharding'] + enabled_features: ['resharding', 'notification_v2'] zones: - name: test-zone1 is_master: true @@ -18,4 +18,4 @@ overrides: is_default: true endpoints: [c2.client.0] rgw-multisite-tests: - args: [tests.py] + args: [tests.py, -a, '!fails_with_rgw'] diff --git a/src/test/rgw/rgw_multi/tests.py b/src/test/rgw/rgw_multi/tests.py index b540e439e2789..b1bb35399eb9e 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -1758,9 +1758,10 @@ def test_account_metadata_sync(): check_oidc_providers_eq(source_conn, target_conn) -# TODO: move sync policy and endpoint tests into separate test file -# fix data sync init tests -''' +# TODO: disable failing tests temporarily +# until they are fixed + +@attr('fails_with_rgw') def test_bucket_reshard_index_log_trim(): zonegroup = realm.master_zonegroup() zonegroup_conns = ZonegroupConns(zonegroup) @@ -1845,6 +1846,7 @@ def test_bucket_reshard_index_log_trim(): test_bilog = bilog_list(zone.zone, test_bucket.name) assert(len(test_bilog) > 0) +@attr('fails_with_rgw') @attr('bucket_reshard') def test_bucket_sync_run_basic_incremental(): """ @@ -1910,6 +1912,7 @@ def trash_bucket(zone, bucket_name): cmd += ['--bucket', bucket_name] zone.cluster.admin(cmd) +@attr('fails_with_rgw') @attr('bucket_reshard') def test_zap_init_bucket_sync_run(): """ @@ -2009,6 +2012,7 @@ def test_bucket_full_sync_after_data_sync_init(): zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) zonegroup_data_checkpoint(zonegroup_conns) +@attr('fails_with_rgw') @attr('data_sync_init') @attr('bucket_reshard') def test_resharded_bucket_full_sync_after_data_sync_init(): @@ -2049,6 +2053,7 @@ def test_resharded_bucket_full_sync_after_data_sync_init(): zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) zonegroup_data_checkpoint(zonegroup_conns) +@attr('fails_with_rgw') @attr('data_sync_init') def test_bucket_incremental_sync_after_data_sync_init(): zonegroup = realm.master_zonegroup() @@ -2086,6 +2091,7 @@ def test_bucket_incremental_sync_after_data_sync_init(): zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) zonegroup_data_checkpoint(zonegroup_conns) +@attr('fails_with_rgw') @attr('data_sync_init') @attr('bucket_reshard') def test_resharded_bucket_incremental_sync_latest_after_data_sync_init(): @@ -2134,6 +2140,7 @@ def test_resharded_bucket_incremental_sync_latest_after_data_sync_init(): zonegroup_bucket_checkpoint(zonegroup_conns, bucket.name) zonegroup_data_checkpoint(zonegroup_conns) +@attr('fails_with_rgw') @attr('data_sync_init') @attr('bucket_reshard') def test_resharded_bucket_incremental_sync_oldest_after_data_sync_init(): @@ -2295,6 +2302,7 @@ def remove_sync_group_pipe(cluster, group, pipe_id, bucket = None, args = None): assert False, 'failed to remove sync group pipe groupid=%s, pipe_id=%s, src_zones=%s, dest_zones=%s, bucket=%s' % (group, pipe_id, src_zones, dest_zones, bucket) return json.loads(result_json) +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_policy_config_zonegroup(): """ @@ -2366,6 +2374,7 @@ def test_sync_policy_config_zonegroup(): return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_flow_symmetrical_zonegroup_all(): """ @@ -2423,6 +2432,7 @@ def test_sync_flow_symmetrical_zonegroup_all(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_flow_symmetrical_zonegroup_select(): """ @@ -2491,6 +2501,7 @@ def test_sync_flow_symmetrical_zonegroup_select(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_flow_directional_zonegroup_select(): """ @@ -2608,6 +2619,7 @@ def test_sync_flow_directional_zonegroup_select(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_single_bucket(): """ @@ -2720,6 +2732,7 @@ def test_sync_single_bucket(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_different_buckets(): """ @@ -2869,6 +2882,7 @@ def test_sync_different_buckets(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_multiple_buckets_to_single(): """ @@ -2990,6 +3004,7 @@ def test_sync_multiple_buckets_to_single(): remove_sync_policy_group(c1, "sync-group") return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_single_bucket_to_multiple(): """ -- 2.39.5