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

Update remaining instances of % to format()

This commit is contained in:
Joshua Boniface 2018-06-06 20:39:21 -04:00
parent 6a0e262e96
commit 53e625e1a5
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
NodeInstance.py
View File

@ -25,7 +25,6 @@ import os, sys, socket, time, libvirt, kazoo.client, threading, fencenode
class NodeInstance(): class NodeInstance():
def __init__(self, name, t_node, s_domain, zk): def __init__(self, name, t_node, s_domain, zk):
# Passed-in variables on creation # Passed-in variables on creation
self.zkey = '/nodes/%s' % name
self.zk = zk self.zk = zk
self.name = name self.name = name
self.state = 'stop' self.state = 'stop'
@ -37,7 +36,7 @@ class NodeInstance():
self.domain_list = [] self.domain_list = []
# Zookeeper handlers for changed states # Zookeeper handlers for changed states
@zk.DataWatch(self.zkey + '/state') @zk.DataWatch('/nodes/{}/state'.format(self.name))
def watch_hypervisor_state(data, stat, event=""): def watch_hypervisor_state(data, stat, event=""):
try: try:
self.state = data.decode('ascii') self.state = data.decode('ascii')
@ -49,14 +48,14 @@ class NodeInstance():
if self.state == 'unflush': if self.state == 'unflush':
self.unflush() self.unflush()
@zk.DataWatch(self.zkey + '/memfree') @zk.DataWatch('/nodes/{}/memfree'.format(self.name))
def watch_hypervisor_memfree(data, stat, event=""): def watch_hypervisor_memfree(data, stat, event=""):
try: try:
self.memfree = data.decode('ascii') self.memfree = data.decode('ascii')
except AttributeError: except AttributeError:
self.memfree = 0 self.memfree = 0
@zk.DataWatch(self.zkey + '/runningdomains') @zk.DataWatch('/nodes/{}/runningdomains'.format(self.name))
def watch_hypervisor_runningdomains(data, stat, event=""): def watch_hypervisor_runningdomains(data, stat, event=""):
try: try:
self.domain_list = data.decode('ascii').split() self.domain_list = data.decode('ascii').split()
@ -104,7 +103,7 @@ class NodeInstance():
target_hypervisor = hypervisor target_hypervisor = hypervisor
if least_host == None: if least_host == None:
print('>>> Failed to find valid migration target for %s; shutting down.'.format(dom_uuid))) print('>>> Failed to find migration target for VM "{}"; shutting down.'.format(dom_uuid)))
transaction = self.zk.transaction() transaction = self.zk.transaction()
transaction.set_data('/domains/{}/state'.format(dom_uuid), 'shutdown'.encode('ascii')) transaction.set_data('/domains/{}/state'.format(dom_uuid), 'shutdown'.encode('ascii'))
transaction.commit() transaction.commit()
@ -142,7 +141,7 @@ class NodeInstance():
libvirt_name = "qemu:///system" libvirt_name = "qemu:///system"
conn = libvirt.open(libvirt_name) conn = libvirt.open(libvirt_name)
if conn == None: if conn == None:
print('>>> Failed to open connection to %s' % libvirt_name) print('>>> Failed to open connection to {}'.format(libvirt_name))
return return
# Get past state and update if needed # Get past state and update if needed
@ -200,8 +199,8 @@ class NodeInstance():
# Update our local node lists # Update our local node lists
for node_name in self.t_node: for node_name in self.t_node:
try: try:
node_state = self.zk.get('/nodes/%s/state' % node_name)[0].decode('ascii') node_state = self.zk.get('/nodes/{}/state'.format(node_name))[0].decode('ascii')
node_keepalive = int(self.zk.get('/nodes/%s/keepalive' % node_name)[0].decode('ascii')) node_keepalive = int(self.zk.get('/nodes/{}/keepalive'.format(node_name))[0].decode('ascii'))
except: except:
node_state = 'unknown' node_state = 'unknown'
node_keepalive = 0 node_keepalive = 0