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

Improve log messages during VM migration

This commit is contained in:
Joshua Boniface 2021-09-26 23:15:38 -04:00
parent 8ba371723e
commit bf7823deb5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -465,7 +465,6 @@ class VMInstance(object):
dest_lv_conn.close() dest_lv_conn.close()
self.console_log_instance.stop() self.console_log_instance.stop()
self.removeDomainFromList() self.removeDomainFromList()
return True return True
def migrate_shutdown(): def migrate_shutdown():
@ -473,7 +472,7 @@ class VMInstance(object):
self.shutdown_vm() self.shutdown_vm()
return True return True
self.logger.out('Acquiring lock for phase B', state='i') self.logger.out('Acquiring lock for 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)
@ -516,7 +515,7 @@ class VMInstance(object):
time.sleep(0.5) time.sleep(0.5)
self.logger.out('Acquiring lock for phase D', state='i') self.logger.out('Acquiring lock for phase D', state='i', prefix='Domain {}'.format(self.domuuid))
lock.acquire() lock.acquire()
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))
@ -542,7 +541,7 @@ 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 phase A', state='i') self.logger.out('Acquiring lock for 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)
@ -555,15 +554,14 @@ class VMInstance(object):
time.sleep(0.5) time.sleep(0.5)
self.logger.out('Acquiring lock for phase C', state='i') self.logger.out('Acquiring lock for phase C', state='i', prefix='Domain {}'.format(self.domuuid))
lock.acquire() lock.acquire()
# This is strictly a synchrozing step # This is strictly a synchronizng step
time.sleep(0.1)
lock.release() lock.release()
time.sleep(0.5) time.sleep(0.5)
self.logger.out('Acquiring lock for phase E', state='i') self.logger.out('Acquiring lock for phase E', state='i', prefix='Domain {}'.format(self.domuuid))
lock.acquire() lock.acquire()
# 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))