x/timmy
Code Issues Proposed changes

added: represent cluster ids

Browse Source
This commit is contained in:
Aleksandr Dobdin 2016-09-07 10:30:06 +00:00
parent 19e4fec8fd
commit 1b3263d32a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
timmy/env.py
View File

@ -16,7 +16,7 @@
# under the License. # under the License.
project_name = 'timmy' project_name = 'timmy'
version = '1.19.1' version = '1.19.2'
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys

7
timmy/nodes.py
View File

@ -108,6 +108,7 @@ class Node(object):
self.outputs_timestamp = False self.outputs_timestamp = False
self.outputs_timestamp_dir = None self.outputs_timestamp_dir = None
self.apply_conf(conf) self.apply_conf(conf)
self.cluster_repr = "cluster-%s" % str(cluster)
if self.id is not None: if self.id is not None:
self.repr = "node-%s-%s" % (self.id, self.ip) self.repr = "node-%s-%s" % (self.id, self.ip)
else: else:
@ -282,7 +283,7 @@ class Node(object):
return False return False
def exec_cmd(self, fake=False, ok_codes=None): def exec_cmd(self, fake=False, ok_codes=None):
cl = 'cluster-%s' % self.cluster cl = self.cluster_repr
self.logger.debug('%s/%s/%s/%s' % self.logger.debug('%s/%s/%s/%s' %
(self.outdir, Node.ckey, cl, self.repr)) (self.outdir, Node.ckey, cl, self.repr))
if self.cmds: if self.cmds:
@ -367,7 +368,7 @@ class Node(object):
def get_files(self, timeout=15): def get_files(self, timeout=15):
self.logger.info('%s: getting files' % self.repr) self.logger.info('%s: getting files' % self.repr)
cl = 'cluster-%s' % self.cluster cl = self.cluster_repr
if self.files or self.filelists: if self.files or self.filelists:
ddir = os.path.join(self.outdir, Node.fkey, cl, self.repr) ddir = os.path.join(self.outdir, Node.fkey, cl, self.repr)
tools.mdir(ddir) tools.mdir(ddir)
@ -725,6 +726,8 @@ class NodeManager(object):
online=True, online=True,
ip=self.conf['fuel_ip'], ip=self.conf['fuel_ip'],
conf=self.conf) conf=self.conf)
fuelnode.cluster_repr = ""
fuelnode.repr = "fuel"
# soft-skip Fuel if it is hard-filtered # soft-skip Fuel if it is hard-filtered
if not self.filter(fuelnode, self.conf['hard_filter']): if not self.filter(fuelnode, self.conf['hard_filter']):
fuelnode.filtered_out = True fuelnode.filtered_out = True