parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Clean up redundant message output

This commit is contained in:
Joshua Boniface 2020-02-19 16:22:29 -05:00
parent 65932b20d2
commit 0caea03428
1 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
client-cli/pvc.py
View File

@ -368,21 +368,21 @@ def node_secondary(node, wait):
if not retcode:
cleanup(retcode, retmsg)
else:
click.echo(retmsg)
if wait:
click.echo("Waiting for state transition... ", nl=False)
# Every half-second, check if the API is reachable and the node is in secondary state
while True:
try:
_retcode, _retmsg = pvc_node.node_info(config, node)
if _retmsg['coordinator_state'] == 'secondary':
retmsg = "done."
break
else:
if wait:
click.echo(retmsg)
click.echo("Waiting for state transition... ", nl=False)
# Every half-second, check if the API is reachable and the node is in secondary state
while True:
try:
_retcode, _retmsg = pvc_node.node_info(config, node)
if _retmsg['coordinator_state'] == 'secondary':
retmsg = "done."
break
else:
time.sleep(0.5)
except:
time.sleep(0.5)
except:
time.sleep(0.5)
cleanup(retcode, retmsg)
cleanup(retcode, retmsg)
###############################################################################
# pvc node primary
@ -411,21 +411,21 @@ def node_primary(node, wait):
if not retcode:
cleanup(retcode, retmsg)
else:
click.echo(retmsg)
if wait:
click.echo("Waiting for state transition... ", nl=False)
# Every half-second, check if the API is reachable and the node is in secondary state
while True:
try:
_retcode, _retmsg = pvc_node.node_info(config, node)
if _retmsg['coordinator_state'] == 'primary':
retmsg = "done."
break
else:
if wait:
click.echo(retmsg)
click.echo("Waiting for state transition... ", nl=False)
# Every half-second, check if the API is reachable and the node is in secondary state
while True:
try:
_retcode, _retmsg = pvc_node.node_info(config, node)
if _retmsg['coordinator_state'] == 'primary':
retmsg = "done."
break
else:
time.sleep(0.5)
except:
time.sleep(0.5)
except:
time.sleep(0.5)
cleanup(retcode, retmsg)
cleanup(retcode, retmsg)
###############################################################################
# pvc node flush