From 4a73f963c52bbeefccddfa9c5a749809491886f1 Mon Sep 17 00:00:00 2001 From: Nitzan Mordechai Date: Wed, 8 Feb 2023 07:34:07 +0000 Subject: [PATCH] test: Add Rado/perf suites with cbt stat collection To be able to collect cpu per operation, adding stat collection Signed-off-by: Nitzan Mordechai --- qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml | 7 +++++++ qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml | 8 ++++++++ qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml | 7 +++++++ qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml | 7 +++++++ qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml | 7 +++++++ .../rados/perf/workloads/radosbench_4K_rand_read.yaml | 11 +++++++---- .../rados/perf/workloads/radosbench_4K_seq_read.yaml | 7 +++++++ .../rados/perf/workloads/radosbench_4M_rand_read.yaml | 7 +++++++ .../rados/perf/workloads/radosbench_4M_seq_read.yaml | 7 +++++++ .../rados/perf/workloads/radosbench_4M_write.yaml | 7 +++++++ qa/suites/rados/perf/workloads/sample_fio.yaml | 7 +++++++ qa/suites/rados/perf/workloads/sample_radosbench.yaml | 7 +++++++ src/test/crimson/cbt/radosbench_4K_read.yaml | 1 + 13 files changed, 86 insertions(+), 4 deletions(-) diff --git a/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml b/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml index d5ef33ab317..db88bc7a33a 100644 --- a/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml +++ b/qa/suites/rados/perf/workloads/fio_4K_rand_read.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml b/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml index 14d43f143cb..3d324df277f 100644 --- a/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml +++ b/qa/suites/rados/perf/workloads/fio_4K_rand_rw.yaml @@ -13,6 +13,13 @@ tasks: osd_ra: [4096] pool_profile: 'rbd' log_avg_msec: 100 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid cluster: user: 'ubuntu' osds_per_node: 3 @@ -22,3 +29,4 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + pid_dir: /var/run/ceph diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml index b07432243e2..2dcebba0069 100644 --- a/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml +++ b/qa/suites/rados/perf/workloads/fio_4M_rand_read.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml index 5fd6e2877e6..38e066d9e13 100644 --- a/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml +++ b/qa/suites/rados/perf/workloads/fio_4M_rand_rw.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml b/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml index 2d9d8361102..b2c677f267f 100644 --- a/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml +++ b/qa/suites/rados/perf/workloads/fio_4M_rand_write.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml index f1de9b41b4e..4c2b9e926c2 100644 --- a/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml +++ b/qa/suites/rados/perf/workloads/radosbench_4K_rand_read.yaml @@ -5,11 +5,7 @@ tasks: concurrent_ops: 4 concurrent_procs: 2 op_size: [4096] - pool_monitoring_list: - - collectl pool_profile: 'replicated' - run_monitoring_list: - - collectl time: 60 write_only: false readmode: 'rand' @@ -22,3 +18,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml index 8fb204a2f59..363a07efa77 100644 --- a/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml +++ b/qa/suites/rados/perf/workloads/radosbench_4K_seq_read.yaml @@ -21,3 +21,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml index cc1c7448902..1771c75b666 100644 --- a/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml +++ b/qa/suites/rados/perf/workloads/radosbench_4M_rand_read.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml index 3ab55cf51d1..4391a13281f 100644 --- a/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml +++ b/qa/suites/rados/perf/workloads/radosbench_4M_seq_read.yaml @@ -21,3 +21,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml b/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml index f6a5d715cc7..81ebe5c64e8 100644 --- a/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml +++ b/qa/suites/rados/perf/workloads/radosbench_4M_write.yaml @@ -21,3 +21,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/sample_fio.yaml b/qa/suites/rados/perf/workloads/sample_fio.yaml index 98411392d6d..2efb6ca9592 100644 --- a/qa/suites/rados/perf/workloads/sample_fio.yaml +++ b/qa/suites/rados/perf/workloads/sample_fio.yaml @@ -22,3 +22,10 @@ tasks: pg_size: 128 pgp_size: 128 replication: 3 + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/qa/suites/rados/perf/workloads/sample_radosbench.yaml b/qa/suites/rados/perf/workloads/sample_radosbench.yaml index e3dc47ae6f1..cabb9b8ed3e 100644 --- a/qa/suites/rados/perf/workloads/sample_radosbench.yaml +++ b/qa/suites/rados/perf/workloads/sample_radosbench.yaml @@ -21,3 +21,10 @@ tasks: pg_size: 256 pgp_size: 256 replication: 'replicated' + monitoring_profiles: + perf: + nodes: + - osds + perf_cmd: 'perf' + args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' + pid_glob: ceph-osd.*.pid diff --git a/src/test/crimson/cbt/radosbench_4K_read.yaml b/src/test/crimson/cbt/radosbench_4K_read.yaml index 219ce643a7f..5f665dd2337 100644 --- a/src/test/crimson/cbt/radosbench_4K_read.yaml +++ b/src/test/crimson/cbt/radosbench_4K_read.yaml @@ -25,6 +25,7 @@ tasks: perf: nodes: - osds + perf_cmd: 'perf' args: 'stat -p {pid} -o {perf_dir}/perf_stat.{pid}' cluster: osds_per_node: 3 -- 2.47.3