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

Re-add success log output during migration

Browse Source
This commit is contained in:
Joshua Boniface
2021-09-27 11:50:55 -04:00
parent b81e70ec18
commit e514eed414
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
node-daemon/pvcnoded/objects/VMInstance.py
View File

@@ -472,13 +472,14 @@ class VMInstance(object):
self.shutdown_vm() self.shutdown_vm()
return True return True
self.logger.out('Acquiring lock for phase B', state='i', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Acquiring lock for migration phase B', state='i', prefix='Domain {}'.format(self.domuuid))
lock = self.zkhandler.exclusivelock(('domain.migrate.sync_lock', self.domuuid)) lock = self.zkhandler.exclusivelock(('domain.migrate.sync_lock', self.domuuid))
try: try:
lock.acquire(timeout=30.0) lock.acquire(timeout=30.0)
except Exception: except Exception:
abort_migrate('Timed out waiting for peer') abort_migrate('Timed out waiting for peer')
return return
self.logger.out('Acquired lock for migration phase B', state='o', prefix='Domain {}'.format(self.domuuid))
migrate_live_result = False migrate_live_result = False
# Do a final verification # Do a final verification
if self.node == self.lastnode or self.node == self.this_node.name: if self.node == self.lastnode or self.node == self.this_node.name:
@@ -534,19 +535,21 @@ class VMInstance(object):
(('domain.migrate.sync_lock', self.domuuid), self.domuuid) (('domain.migrate.sync_lock', self.domuuid), self.domuuid)
]) ])
self.logger.out('Acquiring lock for migrate synchronization', state='i', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Acquiring lock for migration phase A', state='i', prefix='Domain {}'.format(self.domuuid))
lock = self.zkhandler.exclusivelock(('domain.migrate.sync_lock', self.domuuid)) lock = self.zkhandler.exclusivelock(('domain.migrate.sync_lock', self.domuuid))
try: try:
lock.acquire(timeout=30.0) lock.acquire(timeout=30.0)
except Exception: except Exception:
self.logger.out('Failed to acquire exclusive lock for VM', state='w') self.logger.out('Failed to acquire exclusive lock for VM', state='w')
return return
self.logger.out('Acquired lock for migration phase A', state='o', prefix='Domain {}'.format(self.domuuid))
# Exactly twice the amount of time that the other side is waiting # Exactly twice the amount of time that the other side is waiting
time.sleep(1) time.sleep(1)
lock.release() lock.release()
self.logger.out('Acquiring lock for phase C', state='i', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Acquiring lock for phase C', state='i', prefix='Domain {}'.format(self.domuuid))
lock.acquire() lock.acquire()
self.logger.out('Acquired lock for migration phase C', state='o', prefix='Domain {}'.format(self.domuuid))
# Set the updated data # Set the updated data
self.last_currentnode = self.zkhandler.read(('domain.node', self.domuuid)) self.last_currentnode = self.zkhandler.read(('domain.node', self.domuuid))
self.last_lastnode = self.zkhandler.read(('domain.last_node', self.domuuid)) self.last_lastnode = self.zkhandler.read(('domain.last_node', self.domuuid))