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

Fix bugs with fencing

This commit is contained in:
Joshua Boniface 2019-07-09 19:17:53 -04:00
parent 7df200ac44
commit ad284b13bc
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node-daemon/pvcd/fencing.py
View File

@ -77,29 +77,32 @@ def migrateFromFencedNode(zk_conn, node_name, logger):
logger.out('Moving VMs from dead node "{}" to new hosts'.format(node_name), state='i') logger.out('Moving VMs from dead node "{}" to new hosts'.format(node_name), state='i')
dead_node_running_domains = zkhandler.readdata(zk_conn, '/nodes/{}/runningdomains'.format(node_name)).split() dead_node_running_domains = zkhandler.readdata(zk_conn, '/nodes/{}/runningdomains'.format(node_name)).split()
for dom_uuid in dead_node_running_domains: for dom_uuid in dead_node_running_domains:
target_node = findTargetHypervisor(zk_conn, 'mem', dom_uuid)
logger.out('Flushing RBD locks for VM "{}"'.format(dom_uuid), state='i') logger.out('Flushing RBD locks for VM "{}"'.format(dom_uuid), state='i')
# Get the list of RBD images # Get the list of RBD images
rbd_list = zkhandler.readdata(zk_conn, '/domains/{}/rbdlist'.format(dom_uuid)).split(',') rbd_list = zkhandler.readdata(zk_conn, '/domains/{}/rbdlist'.format(dom_uuid)).split(',')
for rbd in rbd_list: for rbd in rbd_list:
# Check if a lock exists # Check if a lock exists
retcode, stdout, stderr = common.run_os_command('rbd lock list --format json {}'.format(rbd)) lock_list_retcode, lock_list_stdout, lock_list_stderr = common.run_os_command('rbd lock list --format json {}'.format(rbd))
if not retcode: if lock_list_retcode != 0:
logger.out('Failed to obtain lock list for volume "{}"'.format(rbd), state='e') logger.out('Failed to obtain lock list for volume "{}"'.format(rbd), state='e')
continue continue
lock_list = stdout try:
lock_list = json.loads(lock_list_stdout)
except:
lock_list = {}
# If there's at least one lock # If there's at least one lock
if lock_list: if lock_list:
# Loop through the locks # Loop through the locks
for lock, detail in lock_list.items(): for lock, detail in lock_list.items():
# Free the lock # Free the lock
retcode, stdout, stderr = common.run_os_command('rbd lock remove {} "{}" "{}"'.format(rbd, lock, detail['locker'])) lock_remove_retcode, lock_remove_stdout, lock_remove_stderr = common.run_os_command('rbd lock remove {} "{}" "{}"'.format(rbd, lock, detail['locker']))
if not retcode: if lock_remove_retcode != 0:
logger.out('Failed to free RBD lock "{}" on volume "{}"'.format(lock, rbd), state='e') logger.out('Failed to free RBD lock "{}" on volume "{}"'.format(lock, rbd), state='e')
continue continue
logger.out('Freed RBD lock "{}" on volume "{}"'.format(lock, rbd), state='o') logger.out('Freed RBD lock "{}" on volume "{}"'.format(lock, rbd), state='o')
target_node = common.findTargetHypervisor(zk_conn, 'mem', dom_uuid)
logger.out('Migrating VM "{}" to node "{}"'.format(dom_uuid, target_node), state='i') logger.out('Migrating VM "{}" to node "{}"'.format(dom_uuid, target_node), state='i')
zkhandler.writedata(zk_conn, { zkhandler.writedata(zk_conn, {