Fix race condition and such

This commit is contained in:
Joshua Boniface 2018-06-11 17:48:08 -04:00
parent b3169758ff
commit b24d8afc77
1 changed files with 12 additions and 10 deletions

View File

@ -47,22 +47,24 @@ class VMInstance:
def watch_hypervisor(data, stat, event=""): def watch_hypervisor(data, stat, event=""):
print(data.decode('ascii')) print(data.decode('ascii'))
try: try:
self.hypervisor = data.decode('ascii') if self.hypervisor != data.decode('ascii'):
self.state = self.zk.get('/domains/{}/state'.format(self.domuuid)) self.hypervisor = data.decode('ascii')
self.manage_vm_state() self.state = self.zk.get('/domains/{}/state'.format(self.domuuid))[0].decode('ascii')
except: self.manage_vm_state()
pass except Exception as e:
print(e)
# Watch for changes to the state field in Zookeeper # Watch for changes to the state field in Zookeeper
@zk.DataWatch('/domains/{}/state'.format(self.domuuid)) @zk.DataWatch('/domains/{}/state'.format(self.domuuid))
def watch_state(data, stat, event=""): def watch_state(data, stat, event=""):
print(data.decode('ascii')) print(data.decode('ascii'))
try: try:
self.state = data.decode('ascii') if self.state != data.decode('ascii'):
self.hypervisor = self.zk.get('/domains/{}/hypervisor'.format(self.domuuid)) self.state = data.decode('ascii')
self.manage_vm_state() self.hypervisor = self.zk.get('/domains/{}/hypervisor'.format(self.domuuid))[0].decode('ascii')
except: self.manage_vm_state()
pass except Exception as e:
print(e)
# Get data functions # Get data functions
def getstate(self): def getstate(self):