From b26db1752af7fe38659088f519e60a5641680efe Mon Sep 17 00:00:00 2001 From: melanie witt Date: Tue, 6 Dec 2016 16:35:22 +0000 Subject: [PATCH] Pass context as kwarg instead of positional arg to get_engine There are a couple of places in nova/db/api/sqlalchemy.py where the context argument is passed as a positional arg instead of a kwarg, causing it to be erroneously mapped to the use_slave kwarg: def get_engine(use_slave=False, context=None): This corrects to calls to pass context=context instead. Change-Id: I8fb7f04a54d9f7f645df8287cdda0ae665a22368 --- nova/db/sqlalchemy/api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index db6699f93024..6999135199a6 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -630,7 +630,7 @@ def _compute_node_select(context, filters=None, limit=None, marker=None): def _compute_node_fetchall(context, filters=None, limit=None, marker=None): select = _compute_node_select(context, filters, limit=limit, marker=marker) - engine = get_engine(context) + engine = get_engine(context=context) conn = engine.connect() results = conn.execute(select).fetchall() @@ -748,7 +748,7 @@ def compute_node_delete(context, compute_id): @pick_context_manager_reader def compute_node_statistics(context): """Compute statistics over all compute nodes.""" - engine = get_engine(context) + engine = get_engine(context=context) services_tbl = models.Service.__table__ inner_sel = sa.alias(_compute_node_select(context), name='inner_sel')