From e425b65b3d7e0736ce14c7523c8af85754eda27b Mon Sep 17 00:00:00 2001 From: Chris Behrens Date: Sat, 28 Jul 2012 06:13:07 +0000 Subject: Make compute only auto-confirm its own instances Fixes bug 1030226 Change-Id: I0e0cf0c9950f34b1bdab856b2e1c6872b29fdedc --- nova/db/api.py | 11 ++++++++--- nova/db/sqlalchemy/api.py | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'nova/db') diff --git a/nova/db/api.py b/nova/db/api.py index 6e99ad636..96254fe08 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -410,9 +410,14 @@ def migration_get_by_instance_and_status(context, instance_uuid, status): status) -def migration_get_all_unconfirmed(context, confirm_window): - """Finds all unconfirmed migrations within the confirmation window.""" - return IMPL.migration_get_all_unconfirmed(context, confirm_window) +def migration_get_unconfirmed_by_dest_compute(context, confirm_window, + dest_compute): + """ + Finds all unconfirmed migrations within the confirmation window for + a specific destination compute host. + """ + return IMPL.migration_get_unconfirmed_by_dest_compute(context, + confirm_window, dest_compute) #################### diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ccf5a1e8b..8d64874bc 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3674,7 +3674,8 @@ def migration_get_by_instance_and_status(context, instance_uuid, status): @require_admin_context -def migration_get_all_unconfirmed(context, confirm_window, session=None): +def migration_get_unconfirmed_by_dest_compute(context, confirm_window, + dest_compute, session=None): confirm_window = (timeutils.utcnow() - datetime.timedelta(seconds=confirm_window)) @@ -3682,6 +3683,7 @@ def migration_get_all_unconfirmed(context, confirm_window, session=None): read_deleted="yes").\ filter(models.Migration.updated_at <= confirm_window).\ filter_by(status="finished").\ + filter_by(dest_compute=dest_compute).\ all() -- cgit