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

Fix handling of this_node and d_domain in cleanup

This commit is contained in:
Joshua Boniface 2021-07-19 12:30:21 -04:00
parent d48f58930b
commit b7c8c2ee3d
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,8 +76,11 @@ version = '0.9.28'
# Daemon functions # Daemon functions
############################################################################### ###############################################################################
# Ensure the update_timer is None until it's set for real # Ensure update_timer, this_node, and d_domain are None until they're set for real
# Ensures cleanup() doesn't fail due to these items not being created yet
update_timer = None update_timer = None
this_node = None
d_domain = None
# Create timer to update this node in Zookeeper # Create timer to update this node in Zookeeper
@ -711,18 +714,18 @@ def cleanup():
# Waiting for any flushes to complete # Waiting for any flushes to complete
logger.out('Waiting for any active flushes', state='s') logger.out('Waiting for any active flushes', state='s')
if this_node is not None:
while this_node.flush_thread is not None: while this_node.flush_thread is not None:
time.sleep(0.5) time.sleep(0.5)
# Stop console logging on all VMs # Stop console logging on all VMs
logger.out('Stopping domain console watchers', state='s') logger.out('Stopping domain console watchers', state='s')
if d_domain is not None:
for domain in d_domain: for domain in d_domain:
if d_domain[domain].getnode() == myhostname: if d_domain[domain].getnode() == myhostname:
try: try:
d_domain[domain].console_log_instance.stop() d_domain[domain].console_log_instance.stop()
except NameError: except Exception:
pass
except AttributeError:
pass pass
# Force into secondary coordinator state if needed # Force into secondary coordinator state if needed
@ -740,13 +743,11 @@ def cleanup():
# Stop keepalive thread # Stop keepalive thread
try: try:
stopKeepaliveTimer() stopKeepaliveTimer()
except NameError:
pass
except AttributeError:
pass
logger.out('Performing final keepalive update', state='s') logger.out('Performing final keepalive update', state='s')
node_keepalive() node_keepalive()
except Exception:
pass
# Set stop state in Zookeeper # Set stop state in Zookeeper
zkhandler.write([ zkhandler.write([