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

Correct issues with VM lock freeing 

Code was bad and using a depricated feature.
This commit is contained in:
Joshua Boniface 2020-03-02 12:45:12 -05:00
parent 1e4350ca6f
commit c02bc0b46a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
node-daemon/pvcnoded/VMInstance.py
View File

@ -56,13 +56,13 @@ def flush_locks(zk_conn, logger, dom_uuid):
# 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 in lock_list:
# Free the lock # Free the lock
lock_remove_retcode, lock_remove_stdout, lock_remove_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['id'], lock['locker']))
if lock_remove_retcode != 0: if lock_remove_retcode != 0:
logger.out('Failed to free RBD lock "{}" on volume "{}"\n{}'.format(lock, rbd, lock_remove_stderr), state='e') logger.out('Failed to free RBD lock "{}" on volume "{}"\n{}'.format(lock['id'], rbd, lock_remove_stderr), 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['id'], rbd), state='o')
return True return True