From: Sage Weil <sage@redhat.com>
Date: Thu, 4 Feb 2016 15:19:54 +0000 (-0500)
Subject: tasks/thrashosds: fix powercycle, bdev_inject_crash
X-Git-Tag: v11.1.1~58^2^2~93^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4936d404386dc525257acf94f84a085819196fdc;p=ceph.git

tasks/thrashosds: fix powercycle, bdev_inject_crash

The CephManager.kill_osd expects these in its config, not
Thrasher's.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/tasks/thrashosds.py b/tasks/thrashosds.py
index 6acde5e9cab5..d7cbc93f2c63 100644
--- a/tasks/thrashosds.py
+++ b/tasks/thrashosds.py
@@ -159,8 +159,12 @@ def task(ctx, config):
                         'but not available on osd role: {r}'.format(
                             r=remote.name))
 
-    log.info('Beginning thrashosds...')
     cluster_manager = ctx.managers[cluster]
+    for f in ['powercycle', 'bdev_inject_crash']:
+        if config.get(f):
+            cluster_manager.config[f] = config.get(f)
+
+    log.info('Beginning thrashosds...')
     thrash_proc = ceph_manager.Thrasher(
         cluster_manager,
         config,