qa: Disable OSD benchmark from running for tests.

Disable OSD bench from benchmarking the OSDs for teuthology tests. This is to
help prevent a cluster warning pertaining to the IOPS value not lying within
a typical threshold range from being raised.

The tests can rely on the built-in static values as defined by
osd_mclock_max_capacity_iops_[ssd|hdd] which should be good enough.

Fixes: https://tracker.ceph.com/issues/74501
Signed-off-by: Sridhar Seshasayee <sseshasa@redhat.com>
(cherry picked from commit cf04790bede6be13cc27dcdf50fe19a953860321)

 Conflicts:
       qa/config/rados.yaml
- Removed a non-existing option under mon overrides

diff --git a/qa/config/rados.yaml b/qa/config/rados.yaml
index 710847f594b8f2993d7e717588f505e3cde01055..d801ea305bc5b4648959935de3ef311fbad288b9 100644 (file)
--- a/qa/config/rados.yaml
+++ b/qa/config/rados.yaml
@@ -9,5 +9,6 @@ overrides:
         bluestore zero block detection: true
         osd mclock override recovery settings: true
         osd mclock profile: high_recovery_ops
+        osd mclock skip benchmark: true
       mon:
         mon scrub interval: 300

diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index a9cce29539aa1f7d8c7a2cdc16e5cbca266f07b9..52634554de581ec10c96e720e39fb095120a9561 100644 (file)
--- a/qa/tasks/ceph.conf.template
+++ b/qa/tasks/ceph.conf.template
@@ -48,6 +48,7 @@
         osd scrub load threshold = 5.0
        osd scrub max interval = 600
         osd mclock profile = high_recovery_ops
+        osd mclock skip benchmark = true
 
        osd recover clone overlap = true
        osd recovery max chunk = 1048576

diff --git a/qa/tasks/cephadm.conf b/qa/tasks/cephadm.conf
index 374adfbab948147cd2df2c71fd5ba2525c1f35e0..9f72b9d8cfacc8ebab4fbd48021d0a314addbfa0 100644 (file)
--- a/qa/tasks/cephadm.conf
+++ b/qa/tasks/cephadm.conf
@@ -41,6 +41,7 @@ mon allow pool delete = true
 osd scrub load threshold = 5.0
 osd scrub max interval = 600
 osd mclock profile = high_recovery_ops
+osd mclock skip benchmark = true
 
 osd recover clone overlap = true
 osd recovery max chunk = 1048576