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

Handle cleanup from a failure properly

This commit is contained in:
Joshua Boniface 2021-07-19 12:39:13 -04:00
parent b7c8c2ee3d
commit 6ead21a308
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,7 +182,7 @@ def readConfig(pvcnoded_config_file, myhostname):
} }
except Exception as e: except Exception as e:
print('ERROR: Failed to load configuration: {}'.format(e)) print('ERROR: Failed to load configuration: {}'.format(e))
cleanup() cleanup(failure=True)
config = config_general config = config_general
# Handle debugging config # Handle debugging config
@ -239,7 +239,7 @@ def readConfig(pvcnoded_config_file, myhostname):
except Exception as e: except Exception as e:
print('ERROR: Failed to load configuration: {}'.format(e)) print('ERROR: Failed to load configuration: {}'.format(e))
cleanup() cleanup(failure=True)
config = {**config, **config_networking} config = {**config, **config_networking}
# Create the by-id address entries # Create the by-id address entries
@ -253,7 +253,7 @@ def readConfig(pvcnoded_config_file, myhostname):
network = ip_network(config[network_key]) network = ip_network(config[network_key])
except Exception: except Exception:
print('ERROR: Network address {} for {} is not valid!'.format(config[network_key], network_key)) print('ERROR: Network address {} for {} is not valid!'.format(config[network_key], network_key))
cleanup() cleanup(failure=True)
# If we should be autoselected # If we should be autoselected
if config[address_key] == 'by-id': if config[address_key] == 'by-id':
@ -273,7 +273,7 @@ def readConfig(pvcnoded_config_file, myhostname):
raise raise
except Exception: except Exception:
print('ERROR: Floating address {} for {} is not valid!'.format(config[floating_key], floating_key)) print('ERROR: Floating address {} for {} is not valid!'.format(config[floating_key], floating_key))
cleanup() cleanup(failure=True)
# Handle the storage config # Handle the storage config
if config['enable_storage']: if config['enable_storage']:
@ -284,7 +284,7 @@ def readConfig(pvcnoded_config_file, myhostname):
} }
except Exception as e: except Exception as e:
print('ERROR: Failed to load configuration: {}'.format(e)) print('ERROR: Failed to load configuration: {}'.format(e))
cleanup() cleanup(failure=True)
config = {**config, **config_storage} config = {**config, **config_storage}
# Handle an empty ipmi_hostname # Handle an empty ipmi_hostname
@ -702,7 +702,7 @@ else:
# Cleanup function # Cleanup function
def cleanup(): def cleanup(failure=False):
global logger, zkhandler, update_timer, d_domain global logger, zkhandler, update_timer, d_domain
logger.out('Terminating pvcnoded and cleaning up', state='s') logger.out('Terminating pvcnoded and cleaning up', state='s')
@ -767,12 +767,17 @@ def cleanup():
logger.out('Terminated pvc daemon', state='s') logger.out('Terminated pvc daemon', state='s')
logger.terminate() logger.terminate()
os._exit(0) if failure:
retcode = 1
else:
retcode = 0
os._exit(retcode)
# Termination function # Termination function
def term(signum='', frame=''): def term(signum='', frame=''):
cleanup() cleanup(failure=False)
# Hangup (logrotate) function # Hangup (logrotate) function
@ -872,7 +877,7 @@ if enable_hypervisor:
lv_conn.close() lv_conn.close()
except Exception as e: except Exception as e:
logger.out('ERROR: Failed to connect to Libvirt daemon: {}'.format(e), state='e') logger.out('ERROR: Failed to connect to Libvirt daemon: {}'.format(e), state='e')
cleanup() cleanup(failure=True)
############################################################################### ###############################################################################
# PHASE 7c - Ensure NFT is running on the local host # PHASE 7c - Ensure NFT is running on the local host