Avoid re-flush or re-ready nodes if unnecessary

This commit is contained in:
Joshua Boniface 2021-06-05 01:08:13 -04:00
parent 3eedfaa7d5
commit 505c109875
1 changed files with 6 additions and 0 deletions

View File

@ -139,6 +139,9 @@ def flush_node(zkhandler, node, wait=False):
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node) return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node)
if zkhandler.read('/nodes/{}/domainstate'.format(node)) == 'flushed':
return True, 'Hypervisor {} is already flushed.'.format(node)
retmsg = 'Flushing hypervisor {} of running VMs.'.format(node) retmsg = 'Flushing hypervisor {} of running VMs.'.format(node)
# Add the new domain to Zookeeper # Add the new domain to Zookeeper
@ -159,6 +162,9 @@ def ready_node(zkhandler, node, wait=False):
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node) return False, 'ERROR: No node named "{}" is present in the cluster.'.format(node)
if zkhandler.read('/nodes/{}/domainstate'.format(node)) == 'ready':
return True, 'Hypervisor {} is already ready.'.format(node)
retmsg = 'Restoring hypervisor {} to active service.'.format(node) retmsg = 'Restoring hypervisor {} to active service.'.format(node)
# Add the new domain to Zookeeper # Add the new domain to Zookeeper