]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tasks/thrashosds: adjust to per-cluster managers
authorJosh Durgin <jdurgin@redhat.com>
Wed, 23 Mar 2016 20:08:33 +0000 (13:08 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Fri, 20 May 2016 18:08:52 +0000 (11:08 -0700)
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
(cherry picked from commit 05bddf90766aeeabaf4e2274c66eaa8b4db425c9)

tasks/thrashosds.py

index 1b29c6d67b9337a70175171e46c654272143c634..35846987538ee88b3d926fd6e730d8b3c736a7f9 100644 (file)
@@ -171,8 +171,9 @@ def task(ctx, config):
                             r=remote.name))
 
     log.info('Beginning thrashosds...')
+    cluster_manager = ctx.managers[cluster]
     thrash_proc = ceph_manager.Thrasher(
-        ctx.manager,
+        cluster_manager,
         config,
         logger=log.getChild('thrasher')
         )
@@ -181,4 +182,4 @@ def task(ctx, config):
     finally:
         log.info('joining thrashosds')
         thrash_proc.do_join()
-        ctx.manager.wait_for_recovery(config.get('timeout', 360))
+        cluster_manager.wait_for_recovery(config.get('timeout', 360))