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

Remove obsolete monitoring_instance passing

This commit is contained in:
Joshua Boniface 2023-09-15 22:47:09 -04:00
parent 079381c03e
commit 48662e90c1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node-daemon/pvcnoded/Daemon.py
View File

@ -1024,14 +1024,14 @@ def entrypoint():
state="i", state="i",
) )
# Set up the node monitoring instance # Set up the node monitoring instance and thread
monitoring_instance = MonitoringInstance.MonitoringInstance( monitoring_instance = MonitoringInstance.MonitoringInstance(
zkhandler, config, logger, this_node zkhandler, config, logger, this_node
) )
# Start keepalived thread # Start keepalived thread
keepalive_timer = pvcnoded.util.keepalive.start_keepalive_timer( keepalive_timer = pvcnoded.util.keepalive.start_keepalive_timer(
logger, config, zkhandler, this_node, monitoring_instance logger, config, zkhandler, this_node
) )
# Tick loop; does nothing since everything is async # Tick loop; does nothing since everything is async

6
node-daemon/pvcnoded/util/keepalive.py
View File

@ -51,7 +51,7 @@ libvirt_vm_states = {
} }
def start_keepalive_timer(logger, config, zkhandler, this_node, monitoring_instance): def start_keepalive_timer(logger, config, zkhandler, this_node):
keepalive_interval = config["keepalive_interval"] keepalive_interval = config["keepalive_interval"]
logger.out( logger.out(
f"Starting keepalive timer ({keepalive_interval} second interval)", state="s" f"Starting keepalive timer ({keepalive_interval} second interval)", state="s"
@ -59,7 +59,7 @@ def start_keepalive_timer(logger, config, zkhandler, this_node, monitoring_insta
keepalive_timer = BackgroundScheduler() keepalive_timer = BackgroundScheduler()
keepalive_timer.add_job( keepalive_timer.add_job(
node_keepalive, node_keepalive,
args=(logger, config, zkhandler, this_node, monitoring_instance), args=(logger, config, zkhandler, this_node),
trigger="interval", trigger="interval",
seconds=keepalive_interval, seconds=keepalive_interval,
) )
@ -674,7 +674,7 @@ def collect_vm_stats(logger, config, zkhandler, this_node, queue):
# Keepalive update function # Keepalive update function
def node_keepalive(logger, config, zkhandler, this_node, monitoring_instance): def node_keepalive(logger, config, zkhandler, this_node):
debug = config["debug"] debug = config["debug"]
# Display node information to the terminal # Display node information to the terminal