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

Remove the unmigrate comand - this should happen in the client instead

This commit is contained in:
Joshua Boniface 2018-06-04 13:24:19 -04:00
parent 3648238cef
commit fab402dbbb
1 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
VMInstance.py
View File

@ -154,32 +154,6 @@ class VMInstance:
self.inmigrate = False self.inmigrate = False
def unmigrate_vm(self):
self.inmigrate = True
this_hypervisor = self.thishypervisor.name
new_hypervisor = self.zk.get(self.zkey + '/formerhypervisor')[0].decode('ascii')
if new_hypervisor != '':
print('>>> %s - Unmigrating VM' % self.domuuid)
transaction = self.zk.transaction()
transaction.set_data('/domains/' + self.domuuid + '/hypervisor', new_hypervisor.encode('ascii'))
transaction.set_data('/domains/' + self.domuuid + '/formerhypervisor', ''.encode('ascii'))
result = transaction.commit()
migrate_ret = self.live_migrate_vm(new_hypervisor)
if migrate_ret != 0:
print('>>> %s - Could not live migrate VM; forcing away uncleanly' % self.domuuid)
self.stop_vm()
time.sleep(0.5)
return
else:
try:
self.thishypervisor.domain_list.remove(self.domuuid)
except ValueError:
pass
else:
self.zk.set('/domains/' + self.domuuid + '/state', 'start'.encode('ascii'))
self.inmigrate = False
# Receive the migration from another host (wait until VM is running) # Receive the migration from another host (wait until VM is running)
def receive_migrate(self): def receive_migrate(self):
print('>>> %s - Receiving migration' % self.domuuid) print('>>> %s - Receiving migration' % self.domuuid)
@ -234,10 +208,6 @@ class VMInstance:
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "migrate" and self.hypervisor != self.thishypervisor.name and self.inmigrate == False: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "migrate" and self.hypervisor != self.thishypervisor.name and self.inmigrate == False:
self.migrate_vm() self.migrate_vm()
# VM should be unmigrated
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "unmigrate" and self.hypervisor == self.thishypervisor.name and self.inmigrate == False:
self.unmigrate_vm()
# VM is already running and should be # VM is already running and should be
elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "start" and self.hypervisor == self.thishypervisor.name: elif running == libvirt.VIR_DOMAIN_RUNNING and self.state == "start" and self.hypervisor == self.thishypervisor.name:
if not self.domuuid in self.thishypervisor.domain_list: if not self.domuuid in self.thishypervisor.domain_list: