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

Handle former hypervisor stuff properly

Browse Source
This commit is contained in:
Joshua Boniface
2018-06-04 03:00:17 -04:00
parent 8e04d47338
commit b3ebc9bad3
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
NodeInstance.py
View File

@@ -85,8 +85,8 @@ class NodeInstance(threading.Thread):
transaction = self.zk.transaction() transaction = self.zk.transaction()
transaction.set_data('/domains/' + domain + '/state', 'migrate'.encode('ascii')) transaction.set_data('/domains/' + domain + '/state', 'migrate'.encode('ascii'))
transaction.set_data('/domains/' + domain + '/hypervisor', least_host.encode('ascii')) transaction.set_data('/domains/' + domain + '/hypervisor', least_host.encode('ascii'))
transaction.set_data('/domains/' + domain + '/flushedhypervisor', self.name.encode('ascii')) result = transaction.commit()
transaction.commit() print(result)
# Wait 1s between migrations # Wait 1s between migrations
time.sleep(1) time.sleep(1)

13
VMInstance.py
View File

@@ -116,13 +116,14 @@ class VMInstance:
def migrate_vm(self): def migrate_vm(self):
print('>>> %s - Migrating VM to %s' % (self.domuuid, self.hypervisor)) print('>>> %s - Migrating VM to %s' % (self.domuuid, self.hypervisor))
self.inmigrate = True self.inmigrate = True
former_hypervisor = self.thishypervisor.name
try: try:
dest_conn = libvirt.open('qemu+tcp://%s/system' % self.hypervisor) dest_conn = libvirt.open('qemu+tcp://%s/system' % self.hypervisor)
if dest_conn == None: if dest_conn == None:
raise raise
except: except:
print('>>> %s - Failed to open connection to qemu+tcp://%s/system; aborting migration' % self.hypervisor) print('>>> %s - Failed to open connection to qemu+tcp://%s/system; aborting migration' % self.hypervisor)
self.zk.set(self.zkey + '/hypervisor', self.thishypervisor.name.encode('ascii')) self.zk.set(self.zkey + '/hypervisor', former_hypervisor.encode('ascii'))
self.zk.set(self.zkey + '/state', 'start'.encode('ascii')) self.zk.set(self.zkey + '/state', 'start'.encode('ascii'))
return return
@@ -130,7 +131,11 @@ class VMInstance:
target_dom = self.dom.migrate(dest_conn, libvirt.VIR_MIGRATE_LIVE, None, None, 0) target_dom = self.dom.migrate(dest_conn, libvirt.VIR_MIGRATE_LIVE, None, None, 0)
if target_dom == None: if target_dom == None:
raise raise
# Set the former hypervisor to us
self.zk.set(self.zkey + '/formerhypervisor', former_hypervisor.encode('ascii'))
print('>>> %s - Migrated successfully' % self.domuuid) print('>>> %s - Migrated successfully' % self.domuuid)
except: except:
print('>>> %s - Could not live migrate VM; forcing away uncleanly' % self.domuuid) print('>>> %s - Could not live migrate VM; forcing away uncleanly' % self.domuuid)
self.stop_vm() self.stop_vm()
@@ -161,6 +166,12 @@ class VMInstance:
self.zk.set(self.zkey + '/state', 'start'.encode('ascii')) self.zk.set(self.zkey + '/state', 'start'.encode('ascii'))
if not self.domuuid in self.thishypervisor.domain_list: if not self.domuuid in self.thishypervisor.domain_list:
self.thishypervisor.domain_list.append(self.domuuid) self.thishypervisor.domain_list.append(self.domuuid)
# Reset the former_hypervisor key
former_hypervisor = self.zk.get(self.zkey + '/formerhypervisor')
if former_hypervisor == self.thishypervisor.name:
self.zk.set(self.zkey + '/formerhypervisor', ''.encode('ascii'))
print('>>> %s - Migrated successfully' % self.domuuid) print('>>> %s - Migrated successfully' % self.domuuid)
self.inreceive = False self.inreceive = False