From: Samuel Just <sjust@redhat.com>
Date: Thu, 27 Oct 2016 02:33:32 +0000 (-0700)
Subject: thrash-erasure-code: disable ceph-objectstore-tool testing for now
X-Git-Tag: v11.1.1~58^2^2~39^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=66836c957ffd974dec136997e23261ec7de2f0aa;p=ceph.git

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 2266dccb63f..7d494fdad98 100644
--- 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 a089a8e980e..c2e16487572 100644
--- 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 69bc689797d..80a58172169 100644
--- 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 c3ed8c9e9fc..00263c414cc 100644
--- 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 dcfe79387e6..f2928d81c92 100644
--- 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 eff9a63fcb5..9f60bceddc0 100644
--- 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.