From: Sage Weil <sage@newdream.net>
Date: Fri, 22 Jan 2021 15:09:17 +0000 (-0600)
Subject: cephadm: retry for 30s instead of 10s
X-Git-Tag: v16.2.0~230^2~11
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37999064ec604ffbb835dd408fa747d0da1ae745;p=ceph.git

cephadm: retry for 30s instead of 10s

No real reason not to wait longer, and I'm worried about things not coming
up quickly enough on slower or loady machines.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 963f54aebf151ea4624063d930ab85f0a2b1fa79)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index c3b0468f6467..96d7415dc8cc 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -14,7 +14,7 @@ CONTAINER_PREFERENCE = ['podman', 'docker']  # prefer podman to docker
 MIN_PODMAN_VERSION = (2, 0, 2)
 CUSTOM_PS1 = r'[ceph: \u@\h \W]\$ '
 DEFAULT_TIMEOUT = None  # in seconds
-DEFAULT_RETRY = 10
+DEFAULT_RETRY = 15
 SHELL_DEFAULT_CONF = '/etc/ceph/ceph.conf'
 SHELL_DEFAULT_KEYRING = '/etc/ceph/ceph.client.admin.keyring'
 
@@ -1375,7 +1375,7 @@ def is_available(ctx, what, func):
                 % (what, num, retry))
 
         num += 1
-        time.sleep(1)
+        time.sleep(2)
 
 
 def read_config(fn):