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/rbd/mirror/% | 0 qa/suites/rbd/mirror/.qa | 1 + qa/suites/rbd/mirror/base | 1 + qa/suites/rbd/mirror/clients/+ | 0 qa/suites/rbd/mirror/clients/.qa | 1 + qa/suites/rbd/mirror/clients/mirror-extra.yaml | 24 ++++++++++++++++++++++ qa/suites/rbd/mirror/clients/mirror.yaml | 1 + qa/suites/rbd/mirror/cluster | 1 + qa/suites/rbd/mirror/msgr-failures | 1 + qa/suites/rbd/mirror/objectstore | 1 + qa/suites/rbd/mirror/supported-random-distro$ | 1 + qa/suites/rbd/mirror/workloads/.qa | 1 + .../mirror/workloads/rbd-mirror-ha-workunit.yaml | 16 +++++++++++++++ .../rbd-mirror-journal-bootstrap-workunit.yaml | 13 ++++++++++++ .../rbd-mirror-snapshot-bootstrap-workunit.yaml | 13 ++++++++++++ ...bd-mirror-snapshot-workunit-exclusive-lock.yaml | 13 ++++++++++++ .../rbd-mirror-snapshot-workunit-fast-diff.yaml | 13 ++++++++++++ .../rbd-mirror-snapshot-workunit-journaling.yaml | 13 ++++++++++++ .../rbd-mirror-snapshot-workunit-minimum.yaml | 13 ++++++++++++ ...-stress-workunit-min-compat-client-octopus.yaml | 11 ++++++++++ .../workloads/rbd-mirror-workunit-config-key.yaml | 12 +++++++++++ ...-mirror-workunit-min-compat-client-octopus.yaml | 11 ++++++++++ .../workloads/rbd-mirror-workunit-policy-none.yaml | 16 +++++++++++++++ .../rbd-mirror-workunit-policy-simple.yaml | 16 +++++++++++++++ 24 files changed, 193 insertions(+) create mode 100644 qa/suites/rbd/mirror/% create mode 120000 qa/suites/rbd/mirror/.qa create mode 120000 qa/suites/rbd/mirror/base create mode 100644 qa/suites/rbd/mirror/clients/+ create mode 120000 qa/suites/rbd/mirror/clients/.qa create mode 100644 qa/suites/rbd/mirror/clients/mirror-extra.yaml create mode 120000 qa/suites/rbd/mirror/clients/mirror.yaml create mode 120000 qa/suites/rbd/mirror/cluster create mode 120000 qa/suites/rbd/mirror/msgr-failures create mode 120000 qa/suites/rbd/mirror/objectstore create mode 120000 qa/suites/rbd/mirror/supported-random-distro$ create mode 120000 qa/suites/rbd/mirror/workloads/.qa create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-config-key.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml create mode 100644 qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml (limited to 'qa/suites/rbd/mirror') diff --git a/qa/suites/rbd/mirror/% b/qa/suites/rbd/mirror/% new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rbd/mirror/.qa b/qa/suites/rbd/mirror/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/mirror/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/mirror/base b/qa/suites/rbd/mirror/base new file mode 120000 index 000000000..8d9546e21 --- /dev/null +++ b/qa/suites/rbd/mirror/base @@ -0,0 +1 @@ +../mirror-thrash/base \ No newline at end of file diff --git a/qa/suites/rbd/mirror/clients/+ b/qa/suites/rbd/mirror/clients/+ new file mode 100644 index 000000000..e69de29bb diff --git a/qa/suites/rbd/mirror/clients/.qa b/qa/suites/rbd/mirror/clients/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/mirror/clients/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/mirror/clients/mirror-extra.yaml b/qa/suites/rbd/mirror/clients/mirror-extra.yaml new file mode 100644 index 000000000..5eed5cfcd --- /dev/null +++ b/qa/suites/rbd/mirror/clients/mirror-extra.yaml @@ -0,0 +1,24 @@ +meta: +- desc: configure the permissions for client.mirror +overrides: + ceph: + conf: + # override to make these names predictable + client.mirror.4: + admin socket: /var/run/ceph/rbd-mirror.$cluster-$name.asok + pid file: /var/run/ceph/rbd-mirror.$cluster-$name.pid + client.mirror.5: + admin socket: /var/run/ceph/rbd-mirror.$cluster-$name.asok + pid file: /var/run/ceph/rbd-mirror.$cluster-$name.pid + client.mirror.6: + admin socket: /var/run/ceph/rbd-mirror.$cluster-$name.asok + pid file: /var/run/ceph/rbd-mirror.$cluster-$name.pid +tasks: +- exec: + cluster1.client.mirror.0: + - "sudo ceph --cluster cluster1 auth caps client.mirror.4 mon 'profile rbd-mirror' osd 'profile rbd'" + - "sudo ceph --cluster cluster1 auth caps client.mirror.5 mon 'profile rbd-mirror' osd 'profile rbd'" + - "sudo ceph --cluster cluster1 auth caps client.mirror.6 mon 'profile rbd-mirror' osd 'profile rbd'" + - "sudo ceph --cluster cluster2 auth caps client.mirror.4 mon 'profile rbd-mirror' osd 'profile rbd'" + - "sudo ceph --cluster cluster2 auth caps client.mirror.5 mon 'profile rbd-mirror' osd 'profile rbd'" + - "sudo ceph --cluster cluster2 auth caps client.mirror.6 mon 'profile rbd-mirror' osd 'profile rbd'" diff --git a/qa/suites/rbd/mirror/clients/mirror.yaml b/qa/suites/rbd/mirror/clients/mirror.yaml new file mode 120000 index 000000000..0dfb0c785 --- /dev/null +++ b/qa/suites/rbd/mirror/clients/mirror.yaml @@ -0,0 +1 @@ +../../mirror-thrash/clients/mirror.yaml \ No newline at end of file diff --git a/qa/suites/rbd/mirror/cluster b/qa/suites/rbd/mirror/cluster new file mode 120000 index 000000000..3fc87a150 --- /dev/null +++ b/qa/suites/rbd/mirror/cluster @@ -0,0 +1 @@ +../mirror-thrash/cluster \ No newline at end of file diff --git a/qa/suites/rbd/mirror/msgr-failures b/qa/suites/rbd/mirror/msgr-failures new file mode 120000 index 000000000..728aeab33 --- /dev/null +++ b/qa/suites/rbd/mirror/msgr-failures @@ -0,0 +1 @@ +../mirror-thrash/msgr-failures \ No newline at end of file diff --git a/qa/suites/rbd/mirror/objectstore b/qa/suites/rbd/mirror/objectstore new file mode 120000 index 000000000..d751ff121 --- /dev/null +++ b/qa/suites/rbd/mirror/objectstore @@ -0,0 +1 @@ +../mirror-thrash/objectstore \ No newline at end of file diff --git a/qa/suites/rbd/mirror/supported-random-distro$ b/qa/suites/rbd/mirror/supported-random-distro$ new file mode 120000 index 000000000..0862b4457 --- /dev/null +++ b/qa/suites/rbd/mirror/supported-random-distro$ @@ -0,0 +1 @@ +.qa/distros/supported-random-distro$ \ No newline at end of file diff --git a/qa/suites/rbd/mirror/workloads/.qa b/qa/suites/rbd/mirror/workloads/.qa new file mode 120000 index 000000000..a602a0353 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/.qa @@ -0,0 +1 @@ +../.qa/ \ No newline at end of file diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml new file mode 100644 index 000000000..7347f7f76 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-ha-workunit.yaml @@ -0,0 +1,16 @@ +meta: +- desc: run the rbd_mirror_ha.sh workunit to test the rbd-mirror daemon +overrides: + ceph: + conf: + client: + rbd mirror image policy type: none +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_ha.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + timeout: 6h diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml new file mode 100644 index 000000000..b9c5562be --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-journal-bootstrap-workunit.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_bootstrap.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_bootstrap.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '1' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + MIRROR_POOL_MODE: 'pool' + MIRROR_IMAGE_MODE: 'journal' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml new file mode 100644 index 000000000..5ad78474d --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-bootstrap-workunit.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_bootstrap.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_bootstrap.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '1' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + MIRROR_POOL_MODE: 'image' + MIRROR_IMAGE_MODE: 'snapshot' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml new file mode 100644 index 000000000..29047a77d --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_CONFIG_KEY: '1' + RBD_IMAGE_FEATURES: 'layering,exclusive-lock' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml new file mode 100644 index 000000000..af13c92b5 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_CONFIG_KEY: '1' + RBD_IMAGE_FEATURES: 'layering,exclusive-lock,object-map,fast-diff' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml new file mode 100644 index 000000000..5ea2bb105 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_CONFIG_KEY: '1' + RBD_IMAGE_FEATURES: 'layering,exclusive-lock,journaling' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml new file mode 100644 index 000000000..e21d57b2b --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml @@ -0,0 +1,13 @@ +meta: +- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_CONFIG_KEY: '1' + RBD_IMAGE_FEATURES: 'layering' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml new file mode 100644 index 000000000..5cc351bb9 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-stress-workunit-min-compat-client-octopus.yaml @@ -0,0 +1,11 @@ +meta: +- desc: run the rbd_mirror_stress.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_stress.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_MIN_COMPAT_CLIENT: 'octopus' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-config-key.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-config-key.yaml new file mode 100644 index 000000000..0102050eb --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-config-key.yaml @@ -0,0 +1,12 @@ +meta: +- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_journal.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_CONFIG_KEY: '1' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml new file mode 100644 index 000000000..5bd024d2d --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml @@ -0,0 +1,11 @@ +meta: +- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_journal.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' + RBD_MIRROR_MIN_COMPAT_CLIENT: 'octopus' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml new file mode 100644 index 000000000..0a610ea2f --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml @@ -0,0 +1,16 @@ +meta: +- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon +overrides: + ceph: + conf: + client: + rbd mirror image policy type: none +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_journal.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' diff --git a/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml new file mode 100644 index 000000000..883e8abd3 --- /dev/null +++ b/qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml @@ -0,0 +1,16 @@ +meta: +- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon +overrides: + ceph: + conf: + client: + rbd mirror image policy type: simple +tasks: +- workunit: + clients: + cluster1.client.mirror: [rbd/rbd_mirror_journal.sh] + env: + # override workunit setting of CEPH_ARGS='--cluster' + CEPH_ARGS: '' + RBD_MIRROR_INSTANCES: '4' + RBD_MIRROR_USE_EXISTING_CLUSTER: '1' -- cgit v1.2.3