Merge pull request #17902 from tchaikov/wip-21474

qa/tasks: prolong revive_osd() timeout to 6 min Reviewed-by: Sage Weil <sage@redhat.com>
ceph · Sep 25, 2017 · af5032e · af5032e
2 parents 98631e3 + 42be200
commit af5032e
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
@@ -2369,7 +2369,7 @@ def blackhole_kill_osd(self, osd):
         time.sleep(2)
         self.ctx.daemons.get_daemon('osd', osd, self.cluster).stop()
 
-    def revive_osd(self, osd, timeout=150, skip_admin_check=False):
+    def revive_osd(self, osd, timeout=360, skip_admin_check=False):
         """
         Revive osds by either power cycling (if indicated by the config)
         or by restarting.