xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-11-26 11:30:23 +00:00
Code Issues Projects Releases Wiki Activity

Try to have collate preserve original noderange

Browse Source 
When a noderange is given, prepare for a reverse lookup of same nodes,
so collate has a shot of giving back what was put in.
This commit is contained in:
Jarrod Johnson 2018-02-14 15:09:21 -05:00
parent 34f03cb217
commit d7b3859460
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
confluent_server/confluent/noderange.py
View File

@ -38,6 +38,9 @@ _parser = pp.nestedExpr(content=_grammar)
_numextractor = pp.OneOrMore(pp.Word(pp.alphas + '-') | pp.Word(pp.nums))
numregex = re.compile('([0-9]+)')
lastnoderange = None
def humanify_nodename(nodename):
"""Analyzes nodename in a human way to enable natural sort
@ -64,6 +67,13 @@ class ReverseNodeRange(object):
def noderange(self):
subsetgroups = []
for group in self.cfm.get_groups(sizesort=True):
if lastnoderange:
for nr in lastnoderange:
if lastnoderange[nr] - self.nodes:
continue
if self.nodes - lastnoderange[nr]:
continue
return nr
nl = set(
self.cfm.get_nodegroup_attributes(group).get('nodes', []))
if len(nl) > len(self.nodes) or not nl:
@ -86,6 +96,7 @@ class NodeRange(object):
"""
def __init__(self, noderange, config=None):
global lastnoderange
self.beginpage = None
self.endpage = None
self.cfm = config
@ -99,6 +110,7 @@ class NodeRange(object):
self._noderange = set(self.cfm.list_nodes())
else:
self._noderange = self._evaluate(elements)
lastnoderange = {noderange: set(self._noderange)}
@property
def nodes(self):