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: v17.1.0~3162^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F39028%2Fhead;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>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0cafc2ea33d1..c46bee0fbd29 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -13,7 +13,7 @@ DATA_DIR_MODE = 0o700
 CONTAINER_PREFERENCE = ['podman', 'docker']  # prefer podman to docker
 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'
 
@@ -1374,7 +1374,7 @@ def is_available(ctx, what, func):
                 % (what, num, retry))
 
         num += 1
-        time.sleep(1)
+        time.sleep(2)
 
 
 def read_config(fn):