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

Add waits and only receive check on send

This commit is contained in:
Joshua Boniface 2020-10-21 10:43:42 -04:00
parent 84ade53fae
commit bae366a316
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -350,6 +350,10 @@ class VMInstance(object):
# Migrate the VM to a target host # Migrate the VM to a target host
def migrate_vm(self, force_live=False): def migrate_vm(self, force_live=False):
# Wait for any previous migration
while self.inmigrate:
time.sleep(0.1)
self.inmigrate = True self.inmigrate = True
self.logger.out('Migrating VM to node "{}"'.format(self.node), state='i', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Migrating VM to node "{}"'.format(self.node), state='i', prefix='Domain {}'.format(self.domuuid))
@ -525,9 +529,9 @@ class VMInstance(object):
# Receive the migration from another host # Receive the migration from another host
def receive_migrate(self): def receive_migrate(self):
# Don't try to migrate a node to itself # Wait for any previous migration
if self.node == self.lastnode: while self.inreceive:
return time.sleep(0.1)
self.inreceive = True self.inreceive = True
live_receive = True live_receive = True
@ -598,7 +602,7 @@ class VMInstance(object):
# The send was shutdown-based # The send was shutdown-based
zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(self.domuuid): 'start' }) zkhandler.writedata(self.zk_conn, { '/domains/{}/state'.format(self.domuuid): 'start' })
else: else:
# The send failed catastrophically # The send failed or was aborted
self.logger.out('Migrate aborted or failed; VM in state {}'.format(self.state), state='w', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Migrate aborted or failed; VM in state {}'.format(self.state), state='w', prefix='Domain {}'.format(self.domuuid))
self.logger.out('Releasing write lock for synchronization phase D', state='i', prefix='Domain {}'.format(self.domuuid)) self.logger.out('Releasing write lock for synchronization phase D', state='i', prefix='Domain {}'.format(self.domuuid))