aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcarey.xu <carey.xuhan@huawei.com>2016-02-03 09:54:03 +0800
committercarey xu <carey.xuhan@huawei.com>2016-02-04 08:46:26 +0000
commit5d2d72b199e1ee1fc37bf7f0cebef471a12ca678 (patch)
tree21548a18c59abb273c6d07248a6f950b674e1bf8
parent9dffaf5649b459ab7afc07d436a45b3df1fab163 (diff)
bugfix: increase retry time when get cluster state
JIRA: COMPASS-301 Change-Id: I10dad32f1f1f7429d0081851042db7dbe204c71e Signed-off-by: carey.xu <carey.xuhan@huawei.com> (cherry picked from commit 85ac2f7c67b586b5d0f3be477e37ed01bb040e9a)
-rw-r--r--deploy/client.py26
1 files changed, 17 insertions, 9 deletions
diff --git a/deploy/client.py b/deploy/client.py
index 174356e..0d51ce2 100644
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -834,6 +834,21 @@ class CompassClient(object):
)
raise RuntimeError("redeploy cluster failed")
+ def get_cluster_state(self, cluster_id):
+ for _ in range(10):
+ try:
+ status, cluster_state = self.client.get_cluster_state(cluster_id)
+ if self.is_ok(status):
+ break
+ except:
+ status = 500
+ cluster_state = ""
+
+ LOG.error("can not get cluster %s's state, try again" % cluster_id)
+ time.sleep(6)
+
+ return status, cluster_state
+
def get_installing_progress(self, cluster_id):
def _get_installing_progress():
"""get intalling progress."""
@@ -843,16 +858,9 @@ class CompassClient(object):
current_time = time.time
while current_time() < deployment_timeout:
- status, cluster_state = self.client.get_cluster_state(cluster_id)
+ status, cluster_state = self.get_cluster_state(cluster_id)
if not self.is_ok(status):
- LOG.error("can not get cluster state")
-
- # maybe a transient error?
- time.sleep(5)
- status, cluster_state = self.client.get_cluster_state(cluster_id)
- if not self.is_ok(status):
- # OK, there's something wrong
- raise RuntimeError("can not get cluster state")
+ raise RuntimeError("can not get cluster state")
if cluster_state['state'] in ['UNINITIALIZED', 'INITIALIZED']:
if current_time() >= action_timeout: