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>

diff --git a/qa/config/rados.yaml b/qa/config/rados.yaml
index ad006bab444d74c490fa5277c1384d10661a1430..716796e6af1ceb0751bfdaca2bac13eb44cf665a 100644 (file)
--- a/qa/config/rados.yaml
+++ b/qa/config/rados.yaml
@@ -9,6 +9,7 @@ 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
-        debug mon: 30
\ No newline at end of file
+        debug mon: 30

diff --git a/qa/tasks/ceph.conf.template b/qa/tasks/ceph.conf.template
index 9fad8ecc6e749ff58fd92044755027c4ab5e92e8..03616dd479cb608b51e1e904ca04add0d58bc214 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 22a8cc657a585b573f18960e521f2246a4828d9b..eed075ca1d626289584ab601944746faaf313c20 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