openstack/tenks
Code Issues Proposed changes

Use round-robin scheduling instead of all-on-one

Browse Source
This commit is contained in:
Will Miller 2018-09-07 13:18:42 +01:00
parent 5707fd3309
commit 8b44c718b4
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ansible/action_plugins/tenks_schedule.py
View File

@ -43,11 +43,14 @@ class ActionModule(ActionBase):
hostname of the hypervisor to which they are scheduled. hostname of the hypervisor to which they are scheduled.
""" """
result = super(ActionModule, self).run(tmp, task_vars) result = super(ActionModule, self).run(tmp, task_vars)
# Initialise our return dict.
result['result'] = {}
del tmp # tmp no longer has any effect del tmp # tmp no longer has any effect
self._validate_vars(task_vars) self._validate_vars(task_vars)
nodes = [] nodes = []
idx = 0 idx = 0
hypervisor_names = task_vars['hypervisor_vars'].keys()
for typ, cnt in six.iteritems(task_vars['specs']): for typ, cnt in six.iteritems(task_vars['specs']):
for _ in six.moves.range(cnt): for _ in six.moves.range(cnt):
node = deepcopy(task_vars['node_types'][typ]) node = deepcopy(task_vars['node_types'][typ])
@ -59,12 +62,15 @@ class ActionModule(ActionBase):
vol['name'] = "%s%d" % (task_vars['vol_name_prefix'], vol['name'] = "%s%d" % (task_vars['vol_name_prefix'],
vol_idx) vol_idx)
nodes.append(node) nodes.append(node)
# Perform round-robin scheduling with node index modulo number
# of hypervisors.
hyp_name = hypervisor_names[idx % len(hypervisor_names)]
try:
result['result'][hyp_name].append(node)
except KeyError:
# This hypervisor doesn't yet have any scheduled nodes.
result['result'][hyp_name] = [node]
idx += 1 idx += 1
# TODO(w-miller): currently we just arbitrarily schedule all nodes to
# the first hypervisor. Improve this algorithm to make it more
# sophisticated.
result['result'] = {task_vars['hypervisor_vars'].keys()[0]: nodes}
return result return result
def _validate_vars(self, task_vars): def _validate_vars(self, task_vars):