openstack
/
nova
Code Issues Proposed changes

Merge "db: Replace use of Executable.scalar(), Executable.execute()"

This commit is contained in:
Zuul 2021-11-23 11:09:58 +00:00 committed by Gerrit Code Review
parent 07dfd853b2 cd3e5a23c9
commit 841e62f4d4
2 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
nova/cmd/status.py
View File

@ -87,10 +87,15 @@ class UpgradeCommands(upgradecheck.UpgradeCommands):
# table, or by only counting compute nodes with a service version of at
# least 15 which was the highest service version when Newton was
# released.
meta = sa.MetaData(bind=main_db_api.get_engine(context=context))
compute_nodes = sa.Table('compute_nodes', meta, autoload=True)
return sa.select([sqlfunc.count()]).select_from(compute_nodes).where(
compute_nodes.c.deleted == 0).scalar()
meta = sa.MetaData()
engine = main_db_api.get_engine(context=context)
compute_nodes = sa.Table('compute_nodes', meta, autoload_with=engine)
with engine.connect() as conn:
return conn.execute(
sa.select(sqlfunc.count()).select_from(compute_nodes).where(
compute_nodes.c.deleted == 0
)
).scalars().first()
def _check_cellsv2(self):
"""Checks to see if cells v2 has been setup.
@ -104,7 +109,7 @@ class UpgradeCommands(upgradecheck.UpgradeCommands):
for compute nodes if there are no host mappings on a fresh install.
"""
meta = sa.MetaData()
meta.bind = api_db_api.get_engine()
engine = api_db_api.get_engine()
cell_mappings = self._get_cell_mappings()
count = len(cell_mappings)
@ -123,9 +128,13 @@ class UpgradeCommands(upgradecheck.UpgradeCommands):
'retry.')
return upgradecheck.Result(upgradecheck.Code.FAILURE, msg)
host_mappings = sa.Table('host_mappings', meta, autoload=True)
count = sa.select([sqlfunc.count()]).select_from(host_mappings)\
.scalar()
host_mappings = sa.Table('host_mappings', meta, autoload_with=engine)
with engine.connect() as conn:
count = conn.execute(
sa.select(sqlfunc.count()).select_from(host_mappings)
).scalars().first()
if count == 0:
# This may be a fresh install in which case there may not be any
# compute_nodes in the cell database if the nova-compute service

12
nova/tests/fixtures/nova.py vendored
View File

@ -925,18 +925,6 @@ class WarningsFixture(fixtures.Fixture):
message=r'Using strings to indicate relationship names .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'ignore',
module='nova',
message=r'The Executable.execute\(\) method is considered .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'ignore',
module='nova',
message=r'The Executable.scalar\(\) method is considered .*',
category=sqla_exc.SADeprecationWarning)
warnings.filterwarnings(
'ignore',
module='nova',