x/mogan
Code Issues Proposed changes

Avoid passing empty aggregates to Placement

Browse Source 
This adds a check before constructing member_of parameters to
avoid passing empty aggregates list to placement.

Also this changes to only get aggregates with affinity_zone
during server group scheduling.

Change-Id: Ic282d5afcad5fa78fdb029e874c78ac10cd73153
This commit is contained in:
Zhenguo Niu 2017-09-18 18:21:43 +08:00
parent 896eed5dea
commit 4d8cdb3992
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mogan/scheduler/filter_scheduler.py
View File

@ -125,6 +125,8 @@ class FilterScheduler(driver.Scheduler):
return server_group return server_group
def _get_nodes_of_aggregates(self, aggregates): def _get_nodes_of_aggregates(self, aggregates):
if not aggregates:
return []
agg_uuids = [agg.uuid for agg in aggregates] agg_uuids = [agg.uuid for agg in aggregates]
query_filters = {'member_of': 'in:' + ','.join(agg_uuids)} query_filters = {'member_of': 'in:' + ','.join(agg_uuids)}
rps = self.reportclient.get_filtered_resource_providers(query_filters) rps = self.reportclient.get_filtered_resource_providers(query_filters)
@ -171,7 +173,8 @@ class FilterScheduler(driver.Scheduler):
_log_and_raise_error('affinity') _log_and_raise_error('affinity')
return selected_affz, selected_nodes[:num_servers] return selected_affz, selected_nodes[:num_servers]
all_aggs = objects.AggregateList.get_all(context) all_aggs = objects.AggregateList.get_by_metadata_key(
context, 'affinity_zone')
all_aggs = sorted(all_aggs, key=lambda a: a.metadata.get( all_aggs = sorted(all_aggs, key=lambda a: a.metadata.get(
'affinity_zone')) 'affinity_zone'))
grouped_aggs = itertools.groupby( grouped_aggs = itertools.groupby(