From 58be3dab69f05b76c8f541fa347611bcf81f82dd Mon Sep 17 00:00:00 2001 From: Boris Pavlovic Date: Mon, 5 Aug 2013 02:53:00 +0400 Subject: [PATCH] Clean up session in db.sqla.api.migration_* methods Remove session parameter from migration_get(): Add _migration_get() that contains same logic that old migration_get(), for internal usage, and new migration_get() that doesn't contains session parameter. Remove session parameters from: migration_get_unconfirmed_by_dest_compute() migration_get_in_progress_by_host_and_node() They are never called with session parameter. blueprint db-session-cleanup Change-Id: I3664c78b6aba4c0640903d0f935bc261d5d2129b --- nova/db/sqlalchemy/api.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index f8e310332bc9..6586176fea4d 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3807,14 +3807,13 @@ def migration_create(context, values): def migration_update(context, id, values): session = get_session() with session.begin(): - migration = migration_get(context, id, session=session) + migration = _migration_get(context, id, session=session) migration.update(values) migration.save(session=session) return migration -@require_admin_context -def migration_get(context, id, session=None): +def _migration_get(context, id, session=None): result = model_query(context, models.Migration, session=session, read_deleted="yes").\ filter_by(id=id).\ @@ -3826,6 +3825,11 @@ def migration_get(context, id, session=None): return result +@require_admin_context +def migration_get(context, id): + return _migration_get(context, id) + + @require_admin_context def migration_get_by_instance_and_status(context, instance_uuid, status): result = model_query(context, models.Migration, read_deleted="yes").\ @@ -3842,12 +3846,11 @@ def migration_get_by_instance_and_status(context, instance_uuid, status): @require_admin_context def migration_get_unconfirmed_by_dest_compute(context, confirm_window, - dest_compute, session=None): + dest_compute): confirm_window = (timeutils.utcnow() - datetime.timedelta(seconds=confirm_window)) - return model_query(context, models.Migration, session=session, - read_deleted="yes").\ + return model_query(context, models.Migration, read_deleted="yes").\ filter(models.Migration.updated_at <= confirm_window).\ filter_by(status="finished").\ filter_by(dest_compute=dest_compute).\ @@ -3855,10 +3858,9 @@ def migration_get_unconfirmed_by_dest_compute(context, confirm_window, @require_admin_context -def migration_get_in_progress_by_host_and_node(context, host, node, - session=None): +def migration_get_in_progress_by_host_and_node(context, host, node): - return model_query(context, models.Migration, session=session).\ + return model_query(context, models.Migration).\ filter(or_(and_(models.Migration.source_compute == host, models.Migration.source_node == node), and_(models.Migration.dest_compute == host,