From: Zack Cerza <zack@cerza.org>
Date: Fri, 7 Mar 2014 17:36:45 +0000 (-0600)
Subject: Use a timeout of config.get('time') * 2
X-Git-Tag: v0.94.10~27^2^2~364^2~331^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1778d35847eaab55bdd91eb3d1df96fb7d8fc0fe;p=ceph.git

Use a timeout of config.get('time') * 2

Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
---

diff --git a/teuthology/task/radosbench.py b/teuthology/task/radosbench.py
index 8b72fc38e29c..a2c75fb10b50 100644
--- a/teuthology/task/radosbench.py
+++ b/teuthology/task/radosbench.py
@@ -76,7 +76,8 @@ def task(ctx, config):
         yield
     finally:
         log.info('joining radosbench')
-        run.wait(radosbench.itervalues(), timeout=900)
+        timeout = config.get('time', 360) * 2
+        run.wait(radosbench.itervalues(), timeout=timeout)
 
         if pool is not 'data':
             ctx.manager.remove_pool(pool)