From 7f0ae8e03636cf81811b295f62fdb4a5fddafbf2 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) --- ...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 | 37 +++++++++++++++++-- 4 files changed, 35 insertions(+), 6 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 3564c9619b7..1bea381077c 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 d445ea4451f..510a3747b09 100644 --- a/src/test/rgw/rgw_multi/tests.py +++ b/src/test/rgw/rgw_multi/tests.py @@ -1919,9 +1919,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) @@ -2006,6 +2007,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(): """ @@ -2071,6 +2073,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(): """ @@ -2193,6 +2196,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(): @@ -2233,6 +2237,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() @@ -2270,6 +2275,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(): @@ -2318,6 +2324,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(): @@ -2479,6 +2486,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(): """ @@ -2550,6 +2558,7 @@ def test_sync_policy_config_zonegroup(): return +@attr('fails_with_rgw') @attr('sync_policy') def test_sync_flow_symmetrical_zonegroup_all(): """ @@ -2607,6 +2616,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(): """ @@ -2675,6 +2685,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(): """ @@ -2792,6 +2803,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(): """ @@ -2904,6 +2916,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(): """ @@ -3053,6 +3066,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(): """ @@ -3174,6 +3188,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(): """ @@ -3302,6 +3317,7 @@ def start_2nd_rgw(zonegroup): z.gateways[1].start() log.info('gateway started zone=%s gateway=%s', z.name, z.gateways[1].endpoint()) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_create_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3319,6 +3335,7 @@ def test_bucket_create_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_remove_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3344,6 +3361,7 @@ def test_bucket_remove_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_object_sync_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3355,6 +3373,7 @@ def test_object_sync_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_object_delete_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3366,6 +3385,7 @@ def test_object_delete_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_concurrent_versioned_object_incremental_sync_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3377,6 +3397,7 @@ def test_concurrent_versioned_object_incremental_sync_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_suspended_delete_marker_full_sync_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3388,6 +3409,7 @@ def test_suspended_delete_marker_full_sync_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_acl_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3399,6 +3421,7 @@ def test_bucket_acl_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_sync_enable_right_after_disable_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3410,6 +3433,7 @@ def test_bucket_sync_enable_right_after_disable_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_multipart_object_sync_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3421,6 +3445,7 @@ def test_multipart_object_sync_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_sync_run_basic_incremental_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3432,6 +3457,7 @@ def test_bucket_sync_run_basic_incremental_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_role_sync_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3443,6 +3469,7 @@ def test_role_sync_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_bucket_full_sync_after_data_sync_init_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3454,6 +3481,7 @@ def test_bucket_full_sync_after_data_sync_init_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_sync_policy_config_zonegroup_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3465,6 +3493,7 @@ def test_sync_policy_config_zonegroup_rgw_down(): finally: start_2nd_rgw(zonegroup) +@attr('fails_with_rgw') @attr('rgw_down') def test_sync_flow_symmetrical_zonegroup_all_rgw_down(): zonegroup = realm.master_zonegroup() @@ -3475,5 +3504,5 @@ def test_sync_flow_symmetrical_zonegroup_all_rgw_down(): test_sync_flow_symmetrical_zonegroup_all() finally: start_2nd_rgw(zonegroup) -''' + -- 2.39.5