fix: flake8 checks
This commit is contained in:
adobdin
parent
a396b2593f
commit
9e4eab4727
@ -68,11 +68,10 @@ def main(argv=None):
|
||||
else:
|
||||
loglevel = logging.INFO
|
||||
if args.log_file:
|
||||
logfile = args.log_file
|
||||
logfile = args.log_file
|
||||
else:
|
||||
logfile = None
|
||||
logging.basicConfig(
|
||||
filename=logfile,
|
||||
logfile = None
|
||||
logging.basicConfig(filename=logfile,
|
||||
level=loglevel,
|
||||
format='%(asctime)s %(levelname)s %(message)s')
|
||||
config = Conf()
|
||||
|
||||
@ -264,7 +264,7 @@ class Node(object):
|
||||
(lfilter, f, str(e)))
|
||||
sys.exit(5)
|
||||
for f in rflogs:
|
||||
logging.debug('apply_exclude_filter: node: %s remove file: %s from log list' % (self.node_id, f ))
|
||||
logging.debug('exclude_filter: node: %s remove: %s' % (self.node_id, f))
|
||||
self.flogs.pop(f, None)
|
||||
return True
|
||||
else:
|
||||
@ -272,7 +272,6 @@ class Node(object):
|
||||
|
||||
def logs_filter(self, filterconf):
|
||||
brstr = 'by_role'
|
||||
flogs = {}
|
||||
logging.info('logs_filter: node: %s, filter: %s' % (self.node_id, filterconf))
|
||||
bynodeidinc = False
|
||||
bynodeidexc = False
|
||||
@ -378,8 +377,7 @@ class Nodes(object):
|
||||
self.load_nodes(conf)
|
||||
self.get_version()
|
||||
|
||||
|
||||
def __str__ (self):
|
||||
def __str__(self):
|
||||
s = "#node-id, cluster, admin-ip, mac, os, roles, online, status\n"
|
||||
for node in sorted(self.nodes.values(), key=lambda x: x.node_id):
|
||||
if (self.cluster and (str(self.cluster) != str(node.cluster)) and
|
||||
@ -389,7 +387,7 @@ class Nodes(object):
|
||||
s += "%s\n" % str(node)
|
||||
return s
|
||||
|
||||
def get_nodes(self,conf):
|
||||
def get_nodes(self, conf):
|
||||
fuel_node_cmd = 'fuel node list --json'
|
||||
fuelnode = Node(node_id=0,
|
||||
cluster=0,
|
||||
@ -471,7 +469,6 @@ class Nodes(object):
|
||||
|
||||
def get_version(self):
|
||||
cmd = "awk -F ':' '/release/ {print \$2}' /etc/nailgun/version.yaml"
|
||||
logging.info('get_version:%s' %self.conf.ssh_opts)
|
||||
fuelnode = self.nodes[self.fuelip]
|
||||
release, err, code = ssh_node(ip=fuelnode.ip,
|
||||
command=cmd,
|
||||
@ -555,16 +552,16 @@ class Nodes(object):
|
||||
run_items = []
|
||||
for node in [n for n in self.nodes.values() if self.exec_filter(n)]:
|
||||
run_items.append(RunItem(target=node.exec_cmd,
|
||||
args={'label': label,
|
||||
'odir': odir,
|
||||
'fake': fake}))
|
||||
args={'label': label,
|
||||
'odir': odir,
|
||||
'fake': fake}))
|
||||
run_batch(run_items, 100)
|
||||
lock.unlock()
|
||||
|
||||
def calculate_log_size(self, timeout=15):
|
||||
lsize = 0
|
||||
for node in [n for n in self.nodes.values() if self.exec_filter(n)]:
|
||||
if not node.log_size_from_find(self.conf.log_files['path'],5):
|
||||
if not node.log_size_from_find(self.conf.log_files['path'], 5):
|
||||
logging.warning("can't get log file list from node %s" % node.node_id)
|
||||
else:
|
||||
node.logs_filter(self.conf.log_files['filter'])
|
||||
@ -608,11 +605,12 @@ class Nodes(object):
|
||||
'''Returns interface speed through which logs will be dowloaded'''
|
||||
for node in self.nodes.values():
|
||||
if not (node.ip == 'localhost' or node.ip.startswith('127.')):
|
||||
cmd = "cat /sys/class/net/$(/sbin/ip -o route get %s | cut -d' ' -f3)/speed" % node.ip
|
||||
cmd = ("cat /sys/class/net/$(/sbin/ip -o route get %s | cut -d' ' -f3)/speed" %
|
||||
node.ip)
|
||||
out, err, code = launch_cmd(cmd, node.timeout)
|
||||
if code != 0:
|
||||
logging.error("can't get interface speed: error message: %s" % err)
|
||||
return defspeed
|
||||
logging.error("can't get interface speed: error message: %s" % err)
|
||||
return defspeed
|
||||
try:
|
||||
speed = int(out)
|
||||
except:
|
||||
@ -633,7 +631,7 @@ class Nodes(object):
|
||||
run_items = []
|
||||
for node in [n for n in self.nodes.values() if self.exec_filter(n)]:
|
||||
node.archivelogsfile = os.path.join(outdir,
|
||||
'logs-node-%s.tar.gz' %
|
||||
'logs-node-%s.tar.gz' %
|
||||
str(node.node_id))
|
||||
mdir(outdir)
|
||||
logslistfile = node.archivelogsfile + '.txt'
|
||||
|
||||
@ -90,6 +90,7 @@ def run_batch(item_list, maxthreads):
|
||||
run_item.process.terminate()
|
||||
raise KeyboardInterrupt()
|
||||
|
||||
|
||||
def get_dir_structure(rootdir):
|
||||
"""
|
||||
Creates a nested dictionary that represents the folder structure of rootdir
|
||||
@ -179,11 +180,12 @@ def ssh_node(ip, command, ssh_opts=[], env_vars=[], timeout=15, filename=None,
|
||||
logging.info("ssh_node: inputfile selected, cmd: %s" % cmd)
|
||||
if outputfile is not None:
|
||||
cmd += ' > "' + outputfile + '"'
|
||||
cmd = ("trap 'kill $pid' 15; " +
|
||||
"trap 'kill $pid' 2; " + cmd + '&:; pid=$!; wait $!')
|
||||
cmd = ("trap 'kill $pid' 15; " +
|
||||
"trap 'kill $pid' 2; " + cmd + '&:; pid=$!; wait $!')
|
||||
outs, errs, code = launch_cmd(cmd, timeout)
|
||||
return outs, errs, code
|
||||
|
||||
|
||||
def killall_children(timeout):
|
||||
cmd = 'ps -o pid --ppid %d --noheaders' % os.getpid()
|
||||
out, errs, code = launch_cmd(cmd, timeout)
|
||||
@ -212,6 +214,7 @@ def killall_children(timeout):
|
||||
except:
|
||||
logging.warning('could not kill %s' % p)
|
||||
|
||||
|
||||
def get_files_rsync(ip, data, ssh_opts, dpath, timeout=15):
|
||||
if type(ssh_opts) is list:
|
||||
ssh_opts = ' '.join(ssh_opts)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user