From e6918187568dbd01842d8d1d2c808ce16a894239 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 21 Apr 2024 13:54:28 +0200 Subject: Adding upstream version 18.2.2. Signed-off-by: Daniel Baumann --- qa/suites/rgw/multisite/% | 0 qa/suites/rgw/multisite/.qa | 1 + qa/suites/rgw/multisite/clusters.yaml | 3 +++ qa/suites/rgw/multisite/frontend | 1 + .../rgw/multisite/ignore-pg-availability.yaml | 1 + qa/suites/rgw/multisite/notify.yaml | 5 ++++ qa/suites/rgw/multisite/omap_limits.yaml | 13 +++++++++ qa/suites/rgw/multisite/overrides.yaml | 21 +++++++++++++++ qa/suites/rgw/multisite/realms/.qa | 1 + qa/suites/rgw/multisite/realms/three-zones.yaml | 23 ++++++++++++++++ qa/suites/rgw/multisite/realms/two-zonegroup.yaml | 31 ++++++++++++++++++++++ qa/suites/rgw/multisite/supported-random-distro$ | 1 + qa/suites/rgw/multisite/tasks/.qa | 1 + qa/suites/rgw/multisite/tasks/test_multi.yaml | 17 ++++++++++++ qa/suites/rgw/multisite/valgrind.yaml.disabled | 20 ++++++++++++++ 15 files changed, 139 insertions(+) create mode 100644 qa/suites/rgw/multisite/% create mode 120000 qa/suites/rgw/multisite/.qa create mode 100644 qa/suites/rgw/multisite/clusters.yaml create mode 120000 qa/suites/rgw/multisite/frontend create mode 120000 qa/suites/rgw/multisite/ignore-pg-availability.yaml create mode 100644 qa/suites/rgw/multisite/notify.yaml create mode 100644 qa/suites/rgw/multisite/omap_limits.yaml create mode 100644 qa/suites/rgw/multisite/overrides.yaml create mode 120000 qa/suites/rgw/multisite/realms/.qa create mode 100644 qa/suites/rgw/multisite/realms/three-zones.yaml create mode 100644 qa/suites/rgw/multisite/realms/two-zonegroup.yaml create mode 120000 qa/suites/rgw/multisite/supported-random-distro$ create mode 120000 qa/suites/rgw/multisite/tasks/.qa create mode 100644 qa/suites/rgw/multisite/tasks/test_multi.yaml create mode 100644 qa/suites/rgw/multisite/valgrind.yaml.disabled (limited to 'qa/suites/rgw/multisite') diff --git a/qa/suites/rgw/multisite/% b/qa/suites/rgw/multisite/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rgw/multisite/.qa b/qa/suites/rgw/multisite/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rgw/multisite/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rgw/multisite/clusters.yaml b/qa/suites/rgw/multisite/clusters.yaml new file mode 100644 index 000000000..536ef7ca4 --- /dev/null +++ b/qa/suites/rgw/multisite/clusters.yaml @@ -0,0 +1,3 @@ +roles: +- [c1.mon.a, c1.mgr.x, c1.osd.0, c1.osd.1, c1.osd.2, c1.client.0, c1.client.1] +- [c2.mon.a, c2.mgr.x, c2.osd.0, c2.osd.1, c2.osd.2, c2.client.0, c2.client.1] diff --git a/qa/suites/rgw/multisite/frontend b/qa/suites/rgw/multisite/frontend new file mode 120000 index 000000000..926a53e83 --- /dev/null +++ b/qa/suites/rgw/multisite/frontend @@ -0,0 +1 @@ +.qa/rgw_frontend \ No newline at end of file diff --git a/qa/suites/rgw/multisite/ignore-pg-availability.yaml b/qa/suites/rgw/multisite/ignore-pg-availability.yaml new file mode 120000 index 000000000..32340b1fa --- /dev/null +++ b/qa/suites/rgw/multisite/ignore-pg-availability.yaml @@ -0,0 +1 @@ +.qa/rgw/ignore-pg-availability.yaml \ No newline at end of file diff --git a/qa/suites/rgw/multisite/notify.yaml b/qa/suites/rgw/multisite/notify.yaml new file mode 100644 index 000000000..00e0bb762 --- /dev/null +++ b/qa/suites/rgw/multisite/notify.yaml @@ -0,0 +1,5 @@ +overrides: + ceph: + conf: + client.0: # disable notifications on one zone per cluster + rgw data notify interval msec: 0 diff --git a/qa/suites/rgw/multisite/omap_limits.yaml b/qa/suites/rgw/multisite/omap_limits.yaml new file mode 100644 index 000000000..9ad1ec9ee --- /dev/null +++ b/qa/suites/rgw/multisite/omap_limits.yaml @@ -0,0 +1,13 @@ +overrides: + ceph: + conf: + osd: + # remove the threshold so that test_bucket_index_log_trim() will test DeleteRange + rocksdb delete range threshold: 0 + # instead of expanding the matrix, run each osd with a different omap limit + osd.0: + osd_max_omap_entries_per_request: 10 + osd.1: + osd_max_omap_entries_per_request: 1000 + osd.2: + osd_max_omap_entries_per_request: 10000 diff --git a/qa/suites/rgw/multisite/overrides.yaml b/qa/suites/rgw/multisite/overrides.yaml new file mode 100644 index 000000000..76c14eb91 --- /dev/null +++ b/qa/suites/rgw/multisite/overrides.yaml @@ -0,0 +1,21 @@ +overrides: + ceph: + wait-for-scrub: false + conf: + client: + 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 + rgw sync log trim interval: 0 + rgw curl low speed time: 300 + rgw md log max shards: 4 + rgw data log num shards: 4 + rgw sync obj etag verify: true + rgw sync meta inject err probability: 0.1 + rgw sync data inject err probability: 0.1 + rgw: + compression type: random diff --git a/qa/suites/rgw/multisite/realms/.qa b/qa/suites/rgw/multisite/realms/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rgw/multisite/realms/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rgw/multisite/realms/three-zones.yaml b/qa/suites/rgw/multisite/realms/three-zones.yaml new file mode 100644 index 000000000..95318b0f8 --- /dev/null +++ b/qa/suites/rgw/multisite/realms/three-zones.yaml @@ -0,0 +1,23 @@ +overrides: + rgw-multisite: + realm: + name: test-realm + is default: true + zonegroups: + - name: test-zonegroup + is_master: true + is_default: true + endpoints: [c1.client.0] + enabled_features: ['resharding'] + zones: + - name: test-zone1 + is_master: true + is_default: true + endpoints: [c1.client.0] + - name: test-zone2 + is_default: true + endpoints: [c2.client.0] + - name: test-zone3 + endpoints: [c1.client.1] + rgw-multisite-tests: + args: [tests.py] diff --git a/qa/suites/rgw/multisite/realms/two-zonegroup.yaml b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml new file mode 100644 index 000000000..02710a7d9 --- /dev/null +++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml @@ -0,0 +1,31 @@ +overrides: + rgw-multisite: + realm: + name: test-realm + is default: true + zonegroups: + - name: a + is_master: true + is_default: true + endpoints: [c1.client.0] + enabled_features: ['resharding'] + zones: + - name: a1 + is_master: true + is_default: true + endpoints: [c1.client.0] + - name: a2 + endpoints: [c1.client.1] + - name: b + is_default: true + endpoints: [c2.client.0] + enabled_features: ['resharding'] + zones: + - name: b1 + is_master: true + is_default: true + endpoints: [c2.client.0] + - name: b2 + endpoints: [c2.client.1] + rgw-multisite-tests: + args: [tests.py] diff --git a/qa/suites/rgw/multisite/supported-random-distro$ b/qa/suites/rgw/multisite/supported-random-distro$ new file mode 120000 index 000000000..0862b4457 --- /dev/null +++ b/qa/suites/rgw/multisite/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rgw/multisite/tasks/.qa b/qa/suites/rgw/multisite/tasks/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rgw/multisite/tasks/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rgw/multisite/tasks/test_multi.yaml b/qa/suites/rgw/multisite/tasks/test_multi.yaml new file mode 100644 index 000000000..1a65a67b5 --- /dev/null +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -0,0 +1,17 @@ +tasks: +- install: +- ceph: {cluster: c1} +- ceph: {cluster: c2} +- rgw: + c1.client.0: + port: 8000 + c1.client.1: + port: 8001 + c2.client.0: + port: 8000 + c2.client.1: + port: 8001 +- rgw-multisite: +- rgw-multisite-tests: + config: + reconfigure_delay: 60 diff --git a/qa/suites/rgw/multisite/valgrind.yaml.disabled b/qa/suites/rgw/multisite/valgrind.yaml.disabled new file mode 100644 index 000000000..36e20f02c --- /dev/null +++ b/qa/suites/rgw/multisite/valgrind.yaml.disabled @@ -0,0 +1,20 @@ +overrides: + install: + ceph: + ceph: + conf: + global: + osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false + osd: + osd fast shutdown: false + rgw: + c1.client.0: + valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 + c1.client.1: + valgrind: [--tool=memcheck, --max-threads=1024] + c2.client.0: + valgrind: [--tool=memcheck, --max-threads=1024] + c2.client.1: + valgrind: [--tool=memcheck, --max-threads=1024] -- cgit v1.2.3