From 7b2cbac5177ec42ca9d62915b61327db0d1a3f26 Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Wed, 4 Feb 2015 11:39:18 -0800 Subject: [PATCH] Fixes #10704 Signed-off-by: Yuri Weinstein (cherry picked from commit a9252436e81ab7d21110ffbe2f6b469f08e47d82) --- .../giant-x/parallel/0-cluster/start.yaml | 3 ++ .../parallel/2-workload/ec-rados-default.yaml | 1 - .../parallel/2-workload/{ => parallel_run}/+ | 0 .../parallel_run/ec-rados-parallel.yaml | 1 + .../{ => parallel_run}/rados_api.yaml | 4 +-- .../{ => parallel_run}/rados_loadgenbig.yaml | 4 +-- .../parallel_run/test_cache-pool-snaps.yaml | 36 +++++++++++++++++++ .../{ => parallel_run}/test_rbd_api.yaml | 4 +-- .../{ => parallel_run}/test_rbd_python.yaml | 4 +-- .../sequential_run/ec-rados-default.yaml | 1 + .../2-workload/sequential_run/rados_api.yaml | 8 +++++ .../sequential_run/rados_loadgenbig.yaml | 8 +++++ .../sequential_run/test_cache-pool-snaps.yaml | 36 +++++++++++++++++++ .../sequential_run/test_rbd_api.yaml | 8 +++++ .../sequential_run/test_rbd_python.yaml | 8 +++++ 15 files changed, 117 insertions(+), 9 deletions(-) delete mode 120000 suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml rename suites/upgrade/giant-x/parallel/2-workload/{ => parallel_run}/+ (100%) create mode 120000 suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml rename suites/upgrade/giant-x/parallel/2-workload/{ => parallel_run}/rados_api.yaml (58%) rename suites/upgrade/giant-x/parallel/2-workload/{ => parallel_run}/rados_loadgenbig.yaml (56%) create mode 100644 suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml rename suites/upgrade/giant-x/parallel/2-workload/{ => parallel_run}/test_rbd_api.yaml (57%) rename suites/upgrade/giant-x/parallel/2-workload/{ => parallel_run}/test_rbd_python.yaml (56%) create mode 120000 suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml create mode 100644 suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml create mode 100644 suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml create mode 100644 suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml create mode 100644 suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml create mode 100644 suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml diff --git a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml index 30aac173ce8ff..fcb90eed8425c 100644 --- a/suites/upgrade/giant-x/parallel/0-cluster/start.yaml +++ b/suites/upgrade/giant-x/parallel/0-cluster/start.yaml @@ -9,6 +9,9 @@ roles: - osd.3 - - client.0 - client.1 + - client.2 + - client.3 + - client.4 overrides: ceph: log-whitelist: diff --git a/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml b/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml deleted file mode 120000 index a8a0ae69405a0..0000000000000 --- a/suites/upgrade/giant-x/parallel/2-workload/ec-rados-default.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/2-workload/+ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/+ similarity index 100% rename from suites/upgrade/giant-x/parallel/2-workload/+ rename to suites/upgrade/giant-x/parallel/2-workload/parallel_run/+ diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml new file mode 120000 index 0000000000000..64b3cabfb0c3d --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/ec-rados-parallel.yaml @@ -0,0 +1 @@ +../../../../../../erasure-code/ec-rados-parallel.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml similarity index 58% rename from suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml rename to suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml index 5ed5535c31c46..b3c3bd447479b 100644 --- a/suites/upgrade/giant-x/parallel/2-workload/rados_api.yaml +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_api.yaml @@ -3,6 +3,6 @@ workload: - workunit: branch: giant clients: - client.0: + client.1: - cls - - print: "**** done cls 2-workload" + - print: "**** done cls 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml similarity index 56% rename from suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml rename to suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml index 0c430fe9ca300..943bb83c93a56 100644 --- a/suites/upgrade/giant-x/parallel/2-workload/rados_loadgenbig.yaml +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/rados_loadgenbig.yaml @@ -3,6 +3,6 @@ workload: - workunit: branch: giant clients: - client.0: + client.2: - rados/load-gen-big.sh - - print: "**** done rados/load-gen-big.sh 2-workload" + - print: "**** done rados/load-gen-big.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml new file mode 100644 index 0000000000000..676a9e8e89cbc --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_cache-pool-snaps.yaml @@ -0,0 +1,36 @@ +overrides: + ceph: + log-whitelist: + - must scrub before tier agent can activate +workload: + parallel: + - sequential: + - exec: + client.0: + - ceph osd pool create base 4 + - ceph osd pool create cache 4 + - ceph osd tier add base cache + - ceph osd tier cache-mode cache writeback + - ceph osd tier set-overlay base cache + - ceph osd pool set cache hit_set_type bloom + - ceph osd pool set cache hit_set_count 8 + - ceph osd pool set cache hit_set_period 3600 + - ceph osd pool set cache target_max_objects 250 + - rados: + clients: [client.0] + pools: [base] + ops: 4000 + objects: 500 + pool_snaps: true + op_weights: + read: 100 + write: 100 + delete: 50 + copy_from: 50 + flush: 50 + try_flush: 50 + evict: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 + - print: "**** done test_cache-pool-snaps 2-workload parallel_run" diff --git a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml similarity index 57% rename from suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml rename to suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml index efc1005476e06..7fb49815df811 100644 --- a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_api.yaml +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_api.yaml @@ -3,6 +3,6 @@ workload: - workunit: branch: giant clients: - client.0: + client.3: - rbd/test_librbd.sh - - print: "**** done rbd/test_librbd.sh 2-workload" + - print: "**** done rbd/test_librbd.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml similarity index 56% rename from suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml rename to suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml index d5b1ac2f286eb..7ac5eaa432a46 100644 --- a/suites/upgrade/giant-x/parallel/2-workload/test_rbd_python.yaml +++ b/suites/upgrade/giant-x/parallel/2-workload/parallel_run/test_rbd_python.yaml @@ -3,6 +3,6 @@ workload: - workunit: branch: giant clients: - client.0: + client.4: - rbd/test_librbd_python.sh - - print: "**** done rbd/test_librbd_python.sh 2-workload" + - print: "**** done rbd/test_librbd_python.sh 2-workload parallel" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml new file mode 120000 index 0000000000000..fc05f580a2821 --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/ec-rados-default.yaml @@ -0,0 +1 @@ +../../../../../../erasure-code/ec-rados-default.yaml \ No newline at end of file diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml new file mode 100644 index 0000000000000..f93306071581a --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_api.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: giant + clients: + client.1: + - cls + - print: "**** done cls 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml new file mode 100644 index 0000000000000..7330f84fb2742 --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/rados_loadgenbig.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: giant + clients: + client.2: + - rados/load-gen-big.sh + - print: "**** done rados/load-gen-big.sh 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml new file mode 100644 index 0000000000000..98e4b87dc70c1 --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_cache-pool-snaps.yaml @@ -0,0 +1,36 @@ +overrides: + ceph: + log-whitelist: + - must scrub before tier agent can activate +workload: + parallel: + - sequential: + - exec: + client.0: + - ceph osd pool create base 4 + - ceph osd pool create cache 4 + - ceph osd tier add base cache + - ceph osd tier cache-mode cache writeback + - ceph osd tier set-overlay base cache + - ceph osd pool set cache hit_set_type bloom + - ceph osd pool set cache hit_set_count 8 + - ceph osd pool set cache hit_set_period 3600 + - ceph osd pool set cache target_max_objects 250 + - rados: + clients: [client.0] + pools: [base] + ops: 4000 + objects: 500 + pool_snaps: true + op_weights: + read: 100 + write: 100 + delete: 50 + copy_from: 50 + flush: 50 + try_flush: 50 + evict: 50 + snap_create: 50 + snap_remove: 50 + rollback: 50 + - print: "**** done test_cache-pool-snaps 2-workload sequential_run" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml new file mode 100644 index 0000000000000..d8c1539e8b498 --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_api.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: giant + clients: + client.3: + - rbd/test_librbd.sh + - print: "**** done rbd/test_librbd.sh 2-workload sequential" diff --git a/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml new file mode 100644 index 0000000000000..e62bcb5515edc --- /dev/null +++ b/suites/upgrade/giant-x/parallel/2-workload/sequential_run/test_rbd_python.yaml @@ -0,0 +1,8 @@ +workload: + sequential: + - workunit: + branch: giant + clients: + client.4: + - rbd/test_librbd_python.sh + - print: "**** done rbd/test_librbd_python.sh 2-workload sequential" -- 2.39.5