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 <nmordech@redhat.com>

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 d5ef33ab317522d2cbb292fd2bbc439e1335179e..db88bc7a33a9611f75bdbeb5a1fbb394206f7ec9 100644 (file)
--- 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 14d43f143cb3afe75b4258c59260426416fb830b..3d324df277fcde5aba1e7a642f905201f17bf1db 100644 (file)
--- 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 b07432243e22ff816cc2fb98a0e2bc8daf07963d..2dcebba0069b1626fb739cb0a44d14b318d56508 100644 (file)
--- 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 5fd6e2877e608cc1f0881b811f1093cdba186703..38e066d9e13cf5bcc0066694ec09778cad86873f 100644 (file)
--- 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 2d9d836110279c35ac140a7c65eb20157c774d9f..b2c677f267f9587f9c4a2e1012f02c79eb164ecc 100644 (file)
--- 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 f1de9b41b4ef36ee0aa2b79e1a686a5ea06a3931..4c2b9e926c2673123d0db4d80e25bf4a800b327a 100644 (file)
--- 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 8fb204a2f59614e4f1eddc87bc23ff9031e5e45a..363a07efa7779ab8865a8f31489071c92080f724 100644 (file)
--- 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 cc1c744890203f31a203977d724b0bb8f3f0d2e8..1771c75b6660ab84f0d0209adefc1ece36f3f294 100644 (file)
--- 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 3ab55cf51d1e894e02f0489602234019e2496ea8..4391a13281f9013080548de8c66859e1493cae22 100644 (file)
--- 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 f6a5d715cc7e014694c8431d650042d3242695bf..81ebe5c64e81e807c67c11dd712e5cd9e907e663 100644 (file)
--- 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 98411392d6d58dd5d8a9947f9691862eefd689b6..2efb6ca95925b45f839fb012f44f1c015792daf0 100644 (file)
--- 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 e3dc47ae6f1c5bb029cd27bcbc79a5f2fbf68837..cabb9b8ed3eba2def10244af8ad5a567cc452a56 100644 (file)
--- 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 219ce643a7fbf758ef553bb8220dc707e4cbfe9a..5f665dd23372207ea68d9e88df9c629a4c61dbbb 100644 (file)
--- 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