From 19fcec84d8d7d21e796c7624e521b60d28ee21ed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 20:45:59 +0200 Subject: Adding upstream version 16.2.11+ds. 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/omap_limits.yaml | 13 +++++++++++ qa/suites/rgw/multisite/overrides.yaml | 19 +++++++++++++++ qa/suites/rgw/multisite/realms/.qa | 1 + .../multisite/realms/three-zone-plus-pubsub.yaml | 23 ++++++++++++++++++ qa/suites/rgw/multisite/realms/two-zonegroup.yaml | 27 ++++++++++++++++++++++ qa/suites/rgw/multisite/tasks/.qa | 1 + qa/suites/rgw/multisite/tasks/test_multi.yaml | 26 +++++++++++++++++++++ qa/suites/rgw/multisite/valgrind.yaml | 20 ++++++++++++++++ 13 files changed, 136 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/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-zone-plus-pubsub.yaml create mode 100644 qa/suites/rgw/multisite/realms/two-zonegroup.yaml 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 (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/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..7fff1f49e --- /dev/null +++ b/qa/suites/rgw/multisite/overrides.yaml @@ -0,0 +1,19 @@ +overrides: + ceph: + wait-for-scrub: false + conf: + client: + setuser: ceph + setgroup: ceph + debug rgw: 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: + 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-zone-plus-pubsub.yaml b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.yaml new file mode 100644 index 000000000..e77e5ade4 --- /dev/null +++ b/qa/suites/rgw/multisite/realms/three-zone-plus-pubsub.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] + 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] + - name: test-zone4 + endpoints: [c2.client.1] + is_pubsub: true 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..dc5a786ce --- /dev/null +++ b/qa/suites/rgw/multisite/realms/two-zonegroup.yaml @@ -0,0 +1,27 @@ +overrides: + rgw-multisite: + realm: + name: test-realm + is default: true + zonegroups: + - name: a + is_master: true + is_default: true + endpoints: [c1.client.0] + 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] + zones: + - name: b1 + is_master: true + is_default: true + endpoints: [c2.client.0] + - name: b2 + endpoints: [c2.client.1] 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..3247f2416 --- /dev/null +++ b/qa/suites/rgw/multisite/tasks/test_multi.yaml @@ -0,0 +1,26 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +#os_type: centos +# ubuntu and no valgrind until we migrate test to py3 +os_type: ubuntu + +tasks: +- install: +- ceph: {cluster: c1} +- ceph: {cluster: c2} +- rgw: + c1.client.0: + port: 8000 +# valgrind: [--tool=memcheck, --max-threads=1024] # http://tracker.ceph.com/issues/25214 + c1.client.1: + port: 8001 +# valgrind: [--tool=memcheck, --max-threads=1024] + c2.client.0: + port: 8000 +# valgrind: [--tool=memcheck, --max-threads=1024] + c2.client.1: + port: 8001 +# valgrind: [--tool=memcheck, --max-threads=1024] +- rgw-multisite: +- rgw-multisite-tests: + config: + reconfigure_delay: 60 diff --git a/qa/suites/rgw/multisite/valgrind.yaml b/qa/suites/rgw/multisite/valgrind.yaml new file mode 100644 index 000000000..71c56fae4 --- /dev/null +++ b/qa/suites/rgw/multisite/valgrind.yaml @@ -0,0 +1,20 @@ +# see http://tracker.ceph.com/issues/20360 and http://tracker.ceph.com/issues/18126 +#os_type: centos +# ubuntu and no valgrind until we migrate test to py3 +os_type: ubuntu + +overrides: + install: + ceph: + ceph: + conf: + global: + osd heartbeat grace: 40 + mon: + mon osd crush smoke test: false + osd: + osd fast shutdown: false +# valgrind: +# mon: [--tool=memcheck, --leak-check=full, --show-reachable=yes] +# osd: [--tool=memcheck] +# mds: [--tool=memcheck] -- cgit v1.2.3