summaryrefslogtreecommitdiffstats
path: root/nova/compute
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2013-01-04 09:18:33 -0800
committerGerrit Code Review <review@openstack.org>2013-01-05 04:30:05 +0000
commitd2edb0a0077f6acd6a9db359822b63cc1a19dbff (patch)
tree72dd10290d96f10de1ca5bf42366ad57f2b8bf33 /nova/compute
parentba2a0565a6451ee3227b6e11bbdd8ea75cbf1fc3 (diff)
Move migration_get_unconfirmed_by_dest_compute to conductor
This patch moves compute/manager's use of the db query migration_get_unconfirmed_by_dest_compute to the conductor. Related to blueprint no-db-compute-manager Change-Id: Ic92f3ae09f831465d12809c14c4a18ffd394f26f
Diffstat (limited to 'nova/compute')
-rw-r--r--nova/compute/manager.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 588e437f9..f8b8d08e3 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -2876,7 +2876,8 @@ class ComputeManager(manager.SchedulerDependentManager):
@manager.periodic_task
def _poll_unconfirmed_resizes(self, context):
if CONF.resize_confirm_window > 0:
- migrations = self.db.migration_get_unconfirmed_by_dest_compute(
+ capi = self.conductor_api
+ migrations = capi.migration_get_unconfirmed_by_dest_compute(
context, CONF.resize_confirm_window, self.host)
migrations_info = dict(migration_count=len(migrations),