diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-20 02:03:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-20 02:03:41 +0000 |
| commit | 13079fbd8c56ff374cdb989274c23bd02e46a137 (patch) | |
| tree | 12556a24de36ce183182240f1d7f4109d454aeee /nova/compute | |
| parent | 70ed4ff2cba921262250065257a5002db1a7c19f (diff) | |
| parent | 7df1908aae47461a648df94e7ae4bba912adee5e (diff) | |
Merge "Always yield to other greenthreads after database calls"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 2f977b26c..e4db4a3c2 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2435,9 +2435,6 @@ class ComputeManager(manager.SchedulerDependentManager): {'status': 'error'}) for migration in migrations: - # NOTE(comstud): Yield to other greenthreads. Putting this - # at the top so we make sure to do it on each iteration. - greenthread.sleep(0) migration_id = migration['id'] instance_uuid = migration['instance_uuid'] LOG.info(_("Automatically confirming migration " @@ -2539,8 +2536,6 @@ class ComputeManager(manager.SchedulerDependentManager): refreshed = timeutils.utcnow() for usage in bw_usage: - # Allow switching of greenthreads between queries. - greenthread.sleep(0) self.db.bw_usage_update(context, usage['uuid'], usage['mac_address'], @@ -2584,8 +2579,6 @@ class ComputeManager(manager.SchedulerDependentManager): "%(num_vm_instances)s on the hypervisor.") % locals()) for db_instance in db_instances: - # Allow other periodic tasks to do some work... - greenthread.sleep(0) db_power_state = db_instance['power_state'] if db_instance['task_state'] is not None: LOG.info(_("During sync_power_state the instance has a " |