]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
CephManager: Maximum 2 minutes for raw cluster commands
authorDavid Zafman <dzafman@redhat.com>
Thu, 14 Apr 2016 17:23:58 +0000 (10:23 -0700)
committerDavid Zafman <dzafman@redhat.com>
Fri, 29 Apr 2016 16:43:39 +0000 (09:43 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
tasks/ceph_manager.py

index ddac2eac6ffa05ab9303344e146f2c122479c1a8..1917e3ba6459173d501e96aeb8e8c79ff7e05f82 100644 (file)
@@ -883,6 +883,8 @@ class CephManager:
             'adjust-ulimits',
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
+            'timeout',
+            '120',
             'ceph',
         ]
         ceph_args.extend(args)
@@ -902,6 +904,8 @@ class CephManager:
             'adjust-ulimits',
             'ceph-coverage',
             '{tdir}/archive/coverage'.format(tdir=testdir),
+            'timeout',
+            '120',
             'ceph',
         ]
         ceph_args.extend(args)