Compare commits

..

No commits in common. "89bfbe1fd8b5deb79b756c951d3c45fe497273c4" and "387fcfdf6b5819a707faacf68043e06ed5cb26cf" have entirely different histories.

6 changed files with 1 additions and 14 deletions

View File

@ -81,7 +81,6 @@ def create_app():
print("|--------------------------------------------------------------|") print("|--------------------------------------------------------------|")
print("| Parallel Virtual Cluster API daemon v{0: <23} |".format(version)) print("| Parallel Virtual Cluster API daemon v{0: <23} |".format(version))
print("| Debug: {0: <53} |".format(str(config["debug"]))) print("| Debug: {0: <53} |".format(str(config["debug"])))
print("| Cluster: {0: <51} |".format(config["cluster_name"]))
print("| API version: v{0: <46} |".format(API_VERSION)) print("| API version: v{0: <46} |".format(API_VERSION))
print( print(
"| Listen: {0: <52} |".format( "| Listen: {0: <52} |".format(

View File

@ -496,7 +496,6 @@ def getClusterInformation(zkhandler):
# Format the status data # Format the status data
cluster_information = { cluster_information = {
"cluster_name": zkhandler.read("base.config"),
"cluster_health": getClusterHealthFromFaults(zkhandler, faults_data), "cluster_health": getClusterHealthFromFaults(zkhandler, faults_data),
"node_health": getNodeHealth(zkhandler, node_list), "node_health": getNodeHealth(zkhandler, node_list),
"maintenance": maintenance_state, "maintenance": maintenance_state,

View File

@ -1212,7 +1212,3 @@ def get_detect_device(detect_string):
return device return device
else: else:
return None return None
def translate_domains_to_names(zkhandler, domain_list):
return list(zkhandler.read_many([("domain.name", d) for d in domain_list]))

View File

@ -142,9 +142,7 @@ def getNodeInformation(zkhandler, node_name):
node_mem_free = int(_node_mem_free) node_mem_free = int(_node_mem_free)
node_load = float(_node_load) node_load = float(_node_load)
node_domains_count = int(_node_domains_count) node_domains_count = int(_node_domains_count)
node_running_domains = common.translate_domains_to_names( node_running_domains = _node_running_domains.split()
zkhandler, _node_running_domains.split()
)
try: try:
node_health = int(_node_health) node_health = int(_node_health)

View File

@ -64,7 +64,6 @@ def entrypoint():
logger.out("|--------------------------------------------------------------|") logger.out("|--------------------------------------------------------------|")
logger.out("| Parallel Virtual Cluster health daemon v{0: <20} |".format(version)) logger.out("| Parallel Virtual Cluster health daemon v{0: <20} |".format(version))
logger.out("| Debug: {0: <53} |".format(str(config["debug"]))) logger.out("| Debug: {0: <53} |".format(str(config["debug"])))
logger.out("| Cluster: {0: <51} |".format(config["cluster_name"]))
logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"])) logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"]))
logger.out("| Host: {0: <54} |".format(config["node_hostname"])) logger.out("| Host: {0: <54} |".format(config["node_hostname"]))
logger.out("| ID: {0: <56} |".format(config["node_id"])) logger.out("| ID: {0: <56} |".format(config["node_id"]))

View File

@ -83,7 +83,6 @@ def entrypoint():
logger.out("|--------------------------------------------------------------|") logger.out("|--------------------------------------------------------------|")
logger.out("| Parallel Virtual Cluster node daemon v{0: <22} |".format(version)) logger.out("| Parallel Virtual Cluster node daemon v{0: <22} |".format(version))
logger.out("| Debug: {0: <53} |".format(str(config["debug"]))) logger.out("| Debug: {0: <53} |".format(str(config["debug"])))
logger.out("| Cluster: {0: <51} |".format(config["cluster_name"]))
logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"])) logger.out("| FQDN: {0: <54} |".format(config["node_fqdn"]))
logger.out("| Host: {0: <54} |".format(config["node_hostname"])) logger.out("| Host: {0: <54} |".format(config["node_hostname"]))
logger.out("| ID: {0: <56} |".format(config["node_id"])) logger.out("| ID: {0: <56} |".format(config["node_id"]))
@ -302,9 +301,6 @@ def entrypoint():
# Set up this node in Zookeeper # Set up this node in Zookeeper
pvcnoded.util.zookeeper.setup_node(logger, config, zkhandler) pvcnoded.util.zookeeper.setup_node(logger, config, zkhandler)
# Set the cluster name in Zookeeper
zkhandler.write([("base.config", config["cluster_name"])])
# Check that the primary node key exists and create it with us as primary if not # Check that the primary node key exists and create it with us as primary if not
try: try:
current_primary = zkhandler.read("base.config.primary_node") current_primary = zkhandler.read("base.config.primary_node")