openstack/nova
Code Issues Proposed changes

Merge "Don't pass the entire list of instances to compute"

Browse Source
This commit is contained in:
Jenkins
2013-01-23 21:11:30 +00:00
committed by Gerrit Code Review
parent bdc29d1fe5 12c11e0a37
commit 13290fdb99
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
nova/scheduler/filter_scheduler.py
View File

@@ -47,15 +47,15 @@ class FilterScheduler(driver.Scheduler):
Returns a list of the instances created. Returns a list of the instances created.
""" """
instance_uuids = request_spec.get('instance_uuids')
num_instances = len(instance_uuids)
LOG.debug(_("Attempting to build %(num_instances)d instance(s)") %
locals())
payload = dict(request_spec=request_spec) payload = dict(request_spec=request_spec)
notifier.notify(context, notifier.publisher_id("scheduler"), notifier.notify(context, notifier.publisher_id("scheduler"),
'scheduler.run_instance.start', notifier.INFO, payload) 'scheduler.run_instance.start', notifier.INFO, payload)
instance_uuids = request_spec.pop('instance_uuids')
num_instances = len(instance_uuids)
LOG.debug(_("Attempting to build %(num_instances)d instance(s)") %
locals())
weighed_hosts = self._schedule(context, request_spec, weighed_hosts = self._schedule(context, request_spec,
filter_properties, instance_uuids) filter_properties, instance_uuids)
@@ -124,6 +124,8 @@ class FilterScheduler(driver.Scheduler):
filter_properties, requested_networks, injected_files, filter_properties, requested_networks, injected_files,
admin_password, is_first_time, instance_uuid=None): admin_password, is_first_time, instance_uuid=None):
"""Create the requested resource in this Zone.""" """Create the requested resource in this Zone."""
# NOTE(vish): add our current instance back into the request spec
request_spec['instance_uuids'] = [instance_uuid]
payload = dict(request_spec=request_spec, payload = dict(request_spec=request_spec,
weighted_host=weighed_host.to_dict(), weighted_host=weighed_host.to_dict(),
instance_id=instance_uuid) instance_id=instance_uuid)