diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index 6768205a..cae4a5b7 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -40,6 +40,7 @@ class SimpleScheduler(chance.ChanceScheduler): def _schedule_instance(self, context, instance_opts, *_args, **_kwargs): """Picks a host that is up and has the fewest running instances.""" + elevated = context.elevated() availability_zone = instance_opts.get('availability_zone') @@ -48,13 +49,12 @@ class SimpleScheduler(chance.ChanceScheduler): zone, _x, host = availability_zone.partition(':') if host and context.is_admin: - service = db.service_get_by_args(context.elevated(), host, - 'nova-compute') + service = db.service_get_by_args(elevated, host, 'nova-compute') if not self.service_is_up(service): raise driver.WillNotSchedule(_("Host %s is not alive") % host) return host - results = db.service_get_all_compute_sorted(context) + results = db.service_get_all_compute_sorted(elevated) if zone: results = [(service, cores) for (service, cores) in results if service['availability_zone'] == zone] @@ -90,6 +90,8 @@ class SimpleScheduler(chance.ChanceScheduler): def schedule_create_volume(self, context, volume_id, *_args, **_kwargs): """Picks a host that is up and has the fewest volumes.""" + elevated = context.elevated() + volume_ref = db.volume_get(context, volume_id) availability_zone = volume_ref.get('availability_zone') @@ -97,15 +99,14 @@ class SimpleScheduler(chance.ChanceScheduler): if availability_zone: zone, _x, host = availability_zone.partition(':') if host and context.is_admin: - service = db.service_get_by_args(context.elevated(), host, - 'nova-volume') + service = db.service_get_by_args(elevated, host, 'nova-volume') if not self.service_is_up(service): raise driver.WillNotSchedule(_("Host %s not available") % host) driver.cast_to_volume_host(context, host, 'create_volume', volume_id=volume_id, **_kwargs) return None - results = db.service_get_all_volume_sorted(context) + results = db.service_get_all_volume_sorted(elevated) if zone: results = [(service, gigs) for (service, gigs) in results if service['availability_zone'] == zone] @@ -124,8 +125,9 @@ class SimpleScheduler(chance.ChanceScheduler): def schedule_set_network_host(self, context, *_args, **_kwargs): """Picks a host that is up and has the fewest networks.""" + elevated = context.elevated() - results = db.service_get_all_network_sorted(context) + results = db.service_get_all_network_sorted(elevated) for result in results: (service, instance_count) = result if instance_count >= FLAGS.max_networks: