From b0ff7d6dae548bfc0b15864743c365d6011e9fd9 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) (cherry picked from commit 824fce5521b1e3223767ae7e362aad77b1e48a3d) --- qa/suites/rgw/multisite/overrides.yaml | 3 ++- .../realms/{three-zones.yaml => three-zones.yaml.disabled} | 0 .../realms/{two-zonegroup.yaml => two-zonegroup.yaml.disabled} | 0 qa/suites/rgw/multisite/realms/two-zones.yaml | 1 - 4 files changed, 2 insertions(+), 2 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/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml index 25145aa7d0b..c18440dc82d 100644 --- a/qa/suites/rgw/multisite/overrides.yaml +++ b/qa/suites/rgw/multisite/overrides.yaml @@ -6,6 +6,7 @@ overrides: setuser: ceph setgroup: ceph debug rgw: 20 + debug rgw sync: 20 rgw crypt s3 kms backend: testing rgw crypt s3 kms encryption keys: testkey-1=YmluCmJvb3N0CmJvb3N0LWJ1aWxkCmNlcGguY29uZgo= rgw crypt require ssl: false @@ -16,6 +17,6 @@ overrides: rgw data sync poll interval: 5 rgw meta sync poll interval: 5 rgw sync obj etag verify: true - rgw sync meta inject err probability: 0.1 + rgw sync meta inject err probability: 0.0 rgw: compression type: random 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..86fc0732fc7 100644 --- a/qa/suites/rgw/multisite/realms/two-zones.yaml +++ b/qa/suites/rgw/multisite/realms/two-zones.yaml @@ -8,7 +8,6 @@ overrides: is_master: true is_default: true endpoints: [c1.client.0] - enabled_features: ['resharding'] zones: - name: test-zone1 is_master: true -- 2.47.3