qa/tasks: manage thrashers

* Added daemons to thrashers
* Join the mds thrasher, as the other thrashers did

Fixes: http://tracker.ceph.com/issues/10369
Signed-off-by: Jos Collin <jcollin@redhat.com>

diff --git a/qa/tasks/mds_thrash.py b/qa/tasks/mds_thrash.py
index a4ef8d9850534e55fb24aa99267df6c14666b28b..0547533897282674bd00c7c576514b8526665e5b 100644 (file)
--- a/qa/tasks/mds_thrash.py
+++ b/qa/tasks/mds_thrash.py
@@ -423,10 +423,9 @@ def task(ctx, config):
         log.debug('Yielding')
         yield
     finally:
-        log.info('joining mds_thrashers')
-        for thrasher in ctx.ceph[config['cluster']].thrashers:
-            thrasher.stop()
-            if thrasher.e:
-                raise RuntimeError('error during thrashing')
-            thrasher.join()
+        log.info('joining mds_thrasher')
+        thrasher.stop()
+        if thrasher.e:
+            raise RuntimeError('error during thrashing')
+        thrasher.join()
         log.info('done joining')

diff --git a/qa/tasks/mon_thrash.py b/qa/tasks/mon_thrash.py
index dc1866a2c6adb1213261a882ab60913cec3f4d6f..b4023a978736f5afb4cbc5b06a10700f9a9ebe5b 100644 (file)
--- a/qa/tasks/mon_thrash.py
+++ b/qa/tasks/mon_thrash.py
@@ -356,6 +356,10 @@ def task(ctx, config):
         'mon_thrash task only accepts a dict for configuration'
     assert len(_get_mons(ctx)) > 2, \
         'mon_thrash task requires at least 3 monitors'
+
+    if 'cluster' not in config:
+        config['cluster'] = 'ceph'
+
     log.info('Beginning mon_thrash...')
     first_mon = teuthology.get_first_mon(ctx, config)
     (mon,) = ctx.cluster.only(first_mon).remotes.iterkeys()
@@ -367,6 +371,7 @@ def task(ctx, config):
     thrash_proc = MonitorThrasher(ctx,
         manager, config,
         logger=log.getChild('mon_thrasher'))
+    ctx.ceph[config['cluster']].thrashers.append(thrash_proc)
     try:
         log.debug('Yielding')
         yield

diff --git a/qa/tasks/rbd_mirror_thrash.py b/qa/tasks/rbd_mirror_thrash.py
index 081b353d92bdc4fc63268eb76232af925228d7da..75e1cdab638e1002df30f4c2863bb786b909dd79 100644 (file)
--- a/qa/tasks/rbd_mirror_thrash.py
+++ b/qa/tasks/rbd_mirror_thrash.py
@@ -203,6 +203,7 @@ def task(ctx, config):
 
     thrasher = RBDMirrorThrasher(ctx, config, cluster, daemons)
     thrasher.start()
+    ctx.ceph[cluster].thrashers.append(thrasher)
 
     try:
         log.debug('Yielding')

diff --git a/qa/tasks/thrashosds.py b/qa/tasks/thrashosds.py
index 4f8ed5b608c7a163501b10b58a9e9df0cdbfe6ac..aa8d9c370249d1e967e6a0414a2cf9cba8bc94cc 100644 (file)
--- a/qa/tasks/thrashosds.py
+++ b/qa/tasks/thrashosds.py
@@ -205,6 +205,7 @@ def task(ctx, config):
         config,
         logger=log.getChild('thrasher')
         )
+    ctx.ceph[cluster].thrashers.append(thrash_proc)
     try:
         yield
     finally: