thrash-erasure-code: disable ceph-objectstore-tool testing for now

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/suites/rados/thrash-erasure-code/workloads/ec-pool-snaps-few-objects-overwrites.yaml b/suites/rados/thrash-erasure-code/workloads/ec-pool-snaps-few-objects-overwrites.yaml
index 2266dccb63fd9b7f95faa7db4736633cf7945157..7d494fdad985990585cfd1f3fa5648c4144f3040 100644 (file)
--- a/suites/rados/thrash-erasure-code/workloads/ec-pool-snaps-few-objects-overwrites.yaml
+++ b/suites/rados/thrash-erasure-code/workloads/ec-pool-snaps-few-objects-overwrites.yaml
@@ -3,6 +3,8 @@ overrides:
     conf:
       global:
         enable experimental unrecoverable data corrupting features: '*'
+  thrashosds:
+    disable_objectstore_tool_tests: true
 tasks:
 - rados:
     clients: [client.0]

diff --git a/suites/rados/thrash-erasure-code/workloads/ec-small-objects-fast-read-overwrites.yaml b/suites/rados/thrash-erasure-code/workloads/ec-small-objects-fast-read-overwrites.yaml
index a089a8e980e24b8771794faf8f7cd11f09d4c199..c2e16487572f7f899e21f83100b33b331ba89518 100644 (file)
--- a/suites/rados/thrash-erasure-code/workloads/ec-small-objects-fast-read-overwrites.yaml
+++ b/suites/rados/thrash-erasure-code/workloads/ec-small-objects-fast-read-overwrites.yaml
@@ -3,6 +3,8 @@ overrides:
     conf:
       global:
         enable experimental unrecoverable data corrupting features: '*'
+  thrashosds:
+    disable_objectstore_tool_tests: true
 tasks:
 - rados:
     clients: [client.0]

diff --git a/suites/rados/thrash-erasure-code/workloads/ec-small-objects-overwrites.yaml b/suites/rados/thrash-erasure-code/workloads/ec-small-objects-overwrites.yaml
index 69bc689797d7d69489d80b201f9773a74a01034b..80a581721699f14a252627f4b68b3aa712239a99 100644 (file)
--- a/suites/rados/thrash-erasure-code/workloads/ec-small-objects-overwrites.yaml
+++ b/suites/rados/thrash-erasure-code/workloads/ec-small-objects-overwrites.yaml
@@ -3,6 +3,8 @@ overrides:
     conf:
       global:
         enable experimental unrecoverable data corrupting features: '*'
+  thrashosds:
+    disable_objectstore_tool_tests: true
 tasks:
 - rados:
     clients: [client.0]

diff --git a/suites/rados/thrash-erasure-code/workloads/ec-snaps-few-objects-overwrites.yaml b/suites/rados/thrash-erasure-code/workloads/ec-snaps-few-objects-overwrites.yaml
index c3ed8c9e9fcb5e779523fe5a3eeb68adeeb65af2..00263c414cce54ad7d2f67d90f3956588e8ab7cb 100644 (file)
--- a/suites/rados/thrash-erasure-code/workloads/ec-snaps-few-objects-overwrites.yaml
+++ b/suites/rados/thrash-erasure-code/workloads/ec-snaps-few-objects-overwrites.yaml
@@ -3,6 +3,8 @@ overrides:
     conf:
       global:
         enable experimental unrecoverable data corrupting features: '*'
+  thrashosds:
+    disable_objectstore_tool_tests: true
 tasks:
 - rados:
     clients: [client.0]

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index dcfe79387e65f954cf103a539cfbf7181c8912ca..f2928d81c9243a87e7dc6e7952ed5f64d52b5a0f 100644 (file)
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -151,7 +151,9 @@ class Thrasher:
             self.dump_ops_thread = gevent.spawn(self.do_dump_ops)
         if self.noscrub_toggle_delay:
             self.noscrub_toggle_thread = gevent.spawn(self.do_noscrub_toggle)
-        if self.config.get('powercycle') or not self.cmd_exists_on_osds("ceph-objectstore-tool"):
+        if (self.config.get('powercycle') or
+            not self.cmd_exists_on_osds("ceph-objectstore-tool") or
+            self.config.get('disable_objectstore_tool_tests', False)):
             self.ceph_objectstore_tool = False
             self.test_rm_past_intervals = False
             if self.config.get('powercycle'):

diff --git a/tasks/thrashosds.py b/tasks/thrashosds.py
index eff9a63fcb5b9e5a831e252258a73c0e41266e72..9f60bceddc08aa00cf33bb9bb2c800da507cec88 100644 (file)
--- a/tasks/thrashosds.py
+++ b/tasks/thrashosds.py
@@ -117,6 +117,9 @@ def task(ctx, config):
 
     noscrub_toggle_delay: (2.0) duration to delay between toggling noscrub
 
+    disable_objectstore_tool_tests: (false) disable ceph_objectstore_tool based
+                                    tests
+
     example:
 
     tasks:
@@ -141,10 +144,16 @@ def task(ctx, config):
     config['dump_ops_enable'] = config.get('dump_ops_enable', "true")
     # add default value for noscrub_toggle_delay
     config['noscrub_toggle_delay'] = config.get('noscrub_toggle_delay', 2.0)
+
+    log.info("config is {config}".format(config=str(config)))
+
     overrides = ctx.config.get('overrides', {})
+    log.info("overrides is {overrides}".format(overrides=str(overrides)))
     teuthology.deep_merge(config, overrides.get('thrashosds', {}))
     cluster = config.get('cluster', 'ceph')
 
+    log.info("config is {config}".format(config=str(config)))
+
     if 'powercycle' in config:
 
         # sync everyone first to avoid collateral damage to / etc.