From: Michael Fritch <mfritch@suse.com>
Date: Tue, 9 Jun 2020 20:35:46 +0000 (-0600)
Subject: cephadm: increase is_available timeout 30s -> 60s
X-Git-Tag: v16.1.0~2058^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=de734aa05fdad770c96c70d4b1b6cdddc98ce71b;p=ceph.git

cephadm: increase is_available timeout 30s -> 60s

bootstrap fails because `ceph -s` might take longer
than 30 sec to return on resource limited hardware

Fixes: https://tracker.ceph.com/issues/45961
Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 7c0cb328ee27..1a7adcc9359d 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2509,7 +2509,7 @@ def command_bootstrap():
     # wait for the service to become available
     def is_mon_available():
         # type: () -> bool
-        timeout=args.timeout if args.timeout else 30 # seconds
+        timeout=args.timeout if args.timeout else 60 # seconds
         out, err, ret = call(c.run_cmd(),
                              desc=c.entrypoint,
                              timeout=timeout)
@@ -2568,7 +2568,7 @@ def command_bootstrap():
     logger.info('Waiting for mgr to start...')
     def is_mgr_available():
         # type: () -> bool
-        timeout=args.timeout if args.timeout else 30 # seconds
+        timeout=args.timeout if args.timeout else 60 # seconds
         try:
             out = cli(['status', '-f', 'json-pretty'], timeout=timeout)
             j = json.loads(out)