Skip to content

Commit 3fd8a03

Browse files
author
Prasanna Kumar Kalever
committed
qa/workunits/rbd: merge journal and snapshot test scripts
The idea is to avoid the maintenance of duplicate code in both the journal and snapshot test scripts. Usage: RBD_MIRROR_MODE=journal rbd_mirror.sh Use environment variable RBD_MIRROR_MODE to set the mode Available modes: snapshot | journal Fixes: https://tracker.ceph.com/issues/54312 Signed-off-by: Prasanna Kumar Kalever <[email protected]>
1 parent 0a046b6 commit 3fd8a03

12 files changed

+293
-688
lines changed

‎qa/suites/rbd/mirror-thrash/workloads/rbd-mirror-journal-workunit.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in journal mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_journal.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: "journal"
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_USE_RBD_MIRROR: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-exclusive-lock.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in snapshot mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'snapshot'
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_CONFIG_KEY: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-fast-diff.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in snapshot mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'snapshot'
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_CONFIG_KEY: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-journaling.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in snapshot mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'snapshot'
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_CONFIG_KEY: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-snapshot-workunit-minimum.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_snapshot.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in snapshot mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_snapshot.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'snapshot'
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_CONFIG_KEY: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-config-key.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
meta:
2-
- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in journal mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_journal.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'journal'
1011
RBD_MIRROR_INSTANCES: '4'
1112
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1213
RBD_MIRROR_CONFIG_KEY: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-min-compat-client-octopus.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
meta:
2-
- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in journal mode
33
tasks:
44
- workunit:
55
clients:
6-
cluster1.client.mirror: [rbd/rbd_mirror_journal.sh]
6+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
77
env:
88
# override workunit setting of CEPH_ARGS='--cluster'
99
CEPH_ARGS: ''
10+
RBD_MIRROR_MODE: 'journal'
1011
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'
1112
RBD_MIRROR_MIN_COMPAT_CLIENT: 'octopus'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-none.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
meta:
2-
- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in journal mode
33
overrides:
44
ceph:
55
conf:
@@ -8,9 +8,10 @@ overrides:
88
tasks:
99
- workunit:
1010
clients:
11-
cluster1.client.mirror: [rbd/rbd_mirror_journal.sh]
11+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
1212
env:
1313
# override workunit setting of CEPH_ARGS='--cluster'
1414
CEPH_ARGS: ''
15+
RBD_MIRROR_MODE: 'journal'
1516
RBD_MIRROR_INSTANCES: '4'
1617
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

‎qa/suites/rbd/mirror/workloads/rbd-mirror-workunit-policy-simple.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
meta:
2-
- desc: run the rbd_mirror_journal.sh workunit to test the rbd-mirror daemon
2+
- desc: run the rbd_mirror.sh workunit to test the rbd-mirror daemon in journal mode
33
overrides:
44
ceph:
55
conf:
@@ -8,9 +8,10 @@ overrides:
88
tasks:
99
- workunit:
1010
clients:
11-
cluster1.client.mirror: [rbd/rbd_mirror_journal.sh]
11+
cluster1.client.mirror: [rbd/rbd_mirror.sh]
1212
env:
1313
# override workunit setting of CEPH_ARGS='--cluster'
1414
CEPH_ARGS: ''
15+
RBD_MIRROR_MODE: 'journal'
1516
RBD_MIRROR_INSTANCES: '4'
1617
RBD_MIRROR_USE_EXISTING_CLUSTER: '1'

0 commit comments

Comments
 (0)