From bf7823deb5a042af2d13be64dc5e28d03911f9cc Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Sun, 26 Sep 2021 23:15:38 -0400 Subject: [PATCH] Improve log messages during VM migration --- node-daemon/pvcnoded/objects/VMInstance.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/node-daemon/pvcnoded/objects/VMInstance.py b/node-daemon/pvcnoded/objects/VMInstance.py index 67fdc486..ec41e9c3 100644 --- a/node-daemon/pvcnoded/objects/VMInstance.py +++ b/node-daemon/pvcnoded/objects/VMInstance.py @@ -465,7 +465,6 @@ class VMInstance(object): dest_lv_conn.close() self.console_log_instance.stop() self.removeDomainFromList() - return True def migrate_shutdown(): @@ -473,7 +472,7 @@ class VMInstance(object): self.shutdown_vm() 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)) try: lock.acquire(timeout=30.0) @@ -516,7 +515,7 @@ class VMInstance(object): 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() self.last_currentnode = self.zkhandler.read(('domain.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) ]) - 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)) try: lock.acquire(timeout=30.0) @@ -555,15 +554,14 @@ class VMInstance(object): 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() - # This is strictly a synchrozing step - time.sleep(0.1) + # This is strictly a synchronizng step lock.release() 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() # Set the updated data self.last_currentnode = self.zkhandler.read(('domain.node', self.domuuid))