From: Kefu Chai <kchai@redhat.com>
Date: Fri, 22 Sep 2017 02:58:40 +0000 (+0800)
Subject: qa/tasks: prolong revive_osd() timeout to 6 min
X-Git-Tag: v12.2.2~130^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b4fe14ba0e9f8e1b09ae4112dbebd370136bd3f;p=ceph.git

qa/tasks: prolong revive_osd() timeout to 6 min

bluestore_fsck_on_mount and bluestore_fsck_on_mount_deep are enabled by
default. and bluestore is used as the default store backend. it takes
longer to perform the deep fsck with verbose log. so prolong the
revive_osd()'s timeout from 150 sec to 360 sec.

Fixes: http://tracker.ceph.com/issues/21474
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 42be200c564184feff1056b7771ce3c1b2cc5527)
---

diff --git a/qa/tasks/ceph_manager.py b/qa/tasks/ceph_manager.py
index bdc0fdf405e8..4898658f8fad 100644
--- a/qa/tasks/ceph_manager.py
+++ b/qa/tasks/ceph_manager.py
@@ -2369,7 +2369,7 @@ class CephManager:
         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.