]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: increase is_available timeout 30s -> 60s
authorMichael Fritch <mfritch@suse.com>
Tue, 9 Jun 2020 20:35:46 +0000 (14:35 -0600)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 14 Jul 2020 09:39:06 +0000 (11:39 +0200)
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>
(cherry picked from commit de734aa05fdad770c96c70d4b1b6cdddc98ce71b)

src/cephadm/cephadm

index 5bd28fc24d0b3a5451fd37e885f0f2d867bd4e8f..d00a0aee27b53060a0d9392454c8204f1101c565 100755 (executable)
@@ -2515,7 +2515,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)
@@ -2574,7 +2574,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)