]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Use a timeout of config.get('time') * 2
authorZack Cerza <zack@cerza.org>
Fri, 7 Mar 2014 17:36:45 +0000 (11:36 -0600)
committerZack Cerza <zack@cerza.org>
Fri, 7 Mar 2014 17:36:45 +0000 (11:36 -0600)
Signed-off-by: Zack Cerza <zack.cerza@inktank.com>
teuthology/task/radosbench.py

index 8b72fc38e29cd09914b364e6d701addad791ce21..a2c75fb10b5090f2af02b0bcec23ace236e28c07 100644 (file)
@@ -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)