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

Normalize return messages for node commands

This commit is contained in:
Joshua Boniface 2023-05-04 11:13:06 -04:00
parent 59c9d89986
commit 653b95ee25
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
daemon-common/node.py
View File

@ -127,16 +127,14 @@ def getNodeInformation(zkhandler, node_name):
def secondary_node(zkhandler, node): def secondary_node(zkhandler, node):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
# Ensure node is a coordinator # Ensure node is a coordinator
daemon_mode = zkhandler.read(("node.mode", node)) daemon_mode = zkhandler.read(("node.mode", node))
if daemon_mode == "hypervisor": if daemon_mode == "hypervisor":
return ( return (
False, False,
'ERROR: Cannot change coordinator mode on non-coordinator node "{}"'.format( "ERROR: Cannot change coordinator state on non-coordinator node {}".format(
node node
), ),
) )
@ -144,14 +142,14 @@ def secondary_node(zkhandler, node):
# Ensure node is in run daemonstate # Ensure node is in run daemonstate
daemon_state = zkhandler.read(("node.state.daemon", node)) daemon_state = zkhandler.read(("node.state.daemon", node))
if daemon_state != "run": if daemon_state != "run":
return False, 'ERROR: Node "{}" is not active'.format(node) return False, "ERROR: Node {} is not active".format(node)
# Get current state # Get current state
current_state = zkhandler.read(("node.state.router", node)) current_state = zkhandler.read(("node.state.router", node))
if current_state == "secondary": if current_state == "secondary":
return True, 'Node "{}" is already in secondary coordinator mode.'.format(node) return True, "Node {} is already in secondary coordinator state.".format(node)
retmsg = "Setting node {} in secondary coordinator mode.".format(node) retmsg = "Setting node {} in secondary coordinator state.".format(node)
zkhandler.write([("base.config.primary_node", "none")]) zkhandler.write([("base.config.primary_node", "none")])
return True, retmsg return True, retmsg
@ -160,16 +158,14 @@ def secondary_node(zkhandler, node):
def primary_node(zkhandler, node): def primary_node(zkhandler, node):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
# Ensure node is a coordinator # Ensure node is a coordinator
daemon_mode = zkhandler.read(("node.mode", node)) daemon_mode = zkhandler.read(("node.mode", node))
if daemon_mode == "hypervisor": if daemon_mode == "hypervisor":
return ( return (
False, False,
'ERROR: Cannot change coordinator mode on non-coordinator node "{}"'.format( "ERROR: Cannot change coordinator state on non-coordinator node {}".format(
node node
), ),
) )
@ -177,14 +173,14 @@ def primary_node(zkhandler, node):
# Ensure node is in run daemonstate # Ensure node is in run daemonstate
daemon_state = zkhandler.read(("node.state.daemon", node)) daemon_state = zkhandler.read(("node.state.daemon", node))
if daemon_state != "run": if daemon_state != "run":
return False, 'ERROR: Node "{}" is not active'.format(node) return False, "ERROR: Node {} is not active".format(node)
# Get current state # Get current state
current_state = zkhandler.read(("node.state.router", node)) current_state = zkhandler.read(("node.state.router", node))
if current_state == "primary": if current_state == "primary":
return True, 'Node "{}" is already in primary coordinator mode.'.format(node) return True, "Node {} is already in primary coordinator state.".format(node)
retmsg = "Setting node {} in primary coordinator mode.".format(node) retmsg = "Setting node {} in primary coordinator state.".format(node)
zkhandler.write([("base.config.primary_node", node)]) zkhandler.write([("base.config.primary_node", node)])
return True, retmsg return True, retmsg
@ -193,14 +189,12 @@ def primary_node(zkhandler, node):
def flush_node(zkhandler, node, wait=False): def flush_node(zkhandler, node, wait=False):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
if zkhandler.read(("node.state.domain", node)) == "flushed": if zkhandler.read(("node.state.domain", node)) == "flushed":
return True, "Hypervisor {} is already flushed.".format(node) return True, "Node {} is already flushed.".format(node)
retmsg = "Flushing hypervisor {} of running VMs.".format(node) retmsg = "Removing node {} from active service.".format(node)
# Add the new domain to Zookeeper # Add the new domain to Zookeeper
zkhandler.write([(("node.state.domain", node), "flush")]) zkhandler.write([(("node.state.domain", node), "flush")])
@ -208,7 +202,7 @@ def flush_node(zkhandler, node, wait=False):
if wait: if wait:
while zkhandler.read(("node.state.domain", node)) == "flush": while zkhandler.read(("node.state.domain", node)) == "flush":
time.sleep(1) time.sleep(1)
retmsg = "Flushed hypervisor {} of running VMs.".format(node) retmsg = "Removed node {} from active service.".format(node)
return True, retmsg return True, retmsg
@ -216,14 +210,12 @@ def flush_node(zkhandler, node, wait=False):
def ready_node(zkhandler, node, wait=False): def ready_node(zkhandler, node, wait=False):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
if zkhandler.read(("node.state.domain", node)) == "ready": if zkhandler.read(("node.state.domain", node)) == "ready":
return True, "Hypervisor {} is already ready.".format(node) return True, "Node {} is already ready.".format(node)
retmsg = "Restoring hypervisor {} to active service.".format(node) retmsg = "Restoring node {} to active service.".format(node)
# Add the new domain to Zookeeper # Add the new domain to Zookeeper
zkhandler.write([(("node.state.domain", node), "unflush")]) zkhandler.write([(("node.state.domain", node), "unflush")])
@ -231,7 +223,7 @@ def ready_node(zkhandler, node, wait=False):
if wait: if wait:
while zkhandler.read(("node.state.domain", node)) == "unflush": while zkhandler.read(("node.state.domain", node)) == "unflush":
time.sleep(1) time.sleep(1)
retmsg = "Restored hypervisor {} to active service.".format(node) retmsg = "Restored node {} to active service.".format(node)
return True, retmsg return True, retmsg
@ -239,9 +231,7 @@ def ready_node(zkhandler, node, wait=False):
def get_node_log(zkhandler, node, lines=2000): def get_node_log(zkhandler, node, lines=2000):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
# Get the data from ZK # Get the data from ZK
node_log = zkhandler.read(("logs.messages", node)) node_log = zkhandler.read(("logs.messages", node))
@ -259,14 +249,12 @@ def get_node_log(zkhandler, node, lines=2000):
def get_info(zkhandler, node): def get_info(zkhandler, node):
# Verify node is valid # Verify node is valid
if not common.verifyNode(zkhandler, node): if not common.verifyNode(zkhandler, node):
return False, 'ERROR: No node named "{}" is present in the cluster.'.format( return False, "ERROR: No node named {} is present in the cluster.".format(node)
node
)
# Get information about node in a pretty format # Get information about node in a pretty format
node_information = getNodeInformation(zkhandler, node) node_information = getNodeInformation(zkhandler, node)
if not node_information: if not node_information:
return False, 'ERROR: Could not get information about node "{}".'.format(node) return False, "ERROR: Could not get information about node {}.".format(node)
return True, node_information return True, node_information