From a6d492ed9f3a2d43b2ee64fd09f170598634ad68 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 20 Oct 2020 16:04:26 -0400 Subject: [PATCH] Remove spurious writes and adjust sleep --- node-daemon/pvcnoded/VMInstance.py | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/node-daemon/pvcnoded/VMInstance.py b/node-daemon/pvcnoded/VMInstance.py index 6a20222b..de1553e4 100644 --- a/node-daemon/pvcnoded/VMInstance.py +++ b/node-daemon/pvcnoded/VMInstance.py @@ -476,7 +476,6 @@ class VMInstance(object): do_migrate_shutdown = True self.logger.out('Releasing write lock for synchronization phase B', state='i', prefix='Domain {}'.format(self.domuuid)) - zkhandler.writedata(self.zk_conn, { '/locks/primary_node': self.domuuid }) lock.release() self.logger.out('Released write lock for synchronization phase B', state='o') @@ -494,7 +493,6 @@ class VMInstance(object): migrate_shutdown_result = migrate_shutdown() self.logger.out('Releasing write lock for synchronization phase C', state='i', prefix='Domain {}'.format(self.domuuid)) - zkhandler.writedata(self.zk_conn, { '/locks/primary_node': self.domuuid }) lock.release() self.logger.out('Released write lock for synchronization phase C', state='o') @@ -519,14 +517,11 @@ class VMInstance(object): if self.node == self.lastnode: return - # Slight delay before firing - time.sleep(0.2) - # Wait for any in-progress migrations if zkhandler.readdata(self.zk_conn, '/locks/domain_migrate') != '': self.logger.out('Queueing for completion of existing migration', state='i', prefix='Domain {}'.format(self.domuuid)) while zkhandler.readdata(self.zk_conn, '/locks/domain_migrate') != '': - time.sleep(0.1) + time.sleep(0.2) self.inreceive = True live_receive = True @@ -543,7 +538,6 @@ class VMInstance(object): self.logger.out('Acquired write lock for synchronization phase A', state='o', prefix='Domain {}'.format(self.domuuid)) time.sleep(0.5) # Time for reader to acquire the lock self.logger.out('Releasing write lock for synchronization phase A', state='i', prefix='Domain {}'.format(self.domuuid)) - zkhandler.writedata(self.zk_conn, { '/locks/domain_migrate': self.domuuid }) lock.release() self.logger.out('Released write lock for synchronization phase A', state='o', prefix='Domain {}'.format(self.domuuid)) time.sleep(0.1) # Time for new writer to acquire the lock