openstack/manila
Code Issues Proposed changes

db: Use oslo_db.sqlalchemy.enginefacade

Browse Source 
Start down the road towards migrating from the legacy engine facade
by...creating a legacy engine facade. No, really, this is better since
it allows us to start migrating actual calls from manually creating
sessions to using context-based sessions. This is similar to change
Idae54a17567b558352031ecc573d83ab8b8f04b9 from cinder and the
'sqlalchemy-20' series in cinder (and nova, and placement) provide a
blueprint for what we'll eventually do here.

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Change-Id: I2e4963522be910ae4a3eb113a27e007ea1c380c3
This commit is contained in:
Stephen Finucane 2022-09-06 12:21:10 +01:00
parent ca6c94bd16
commit a84284afd5
2 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/context.py
View File

@ -20,12 +20,14 @@
import copy
from oslo_context import context
from oslo_db.sqlalchemy import enginefacade
from oslo_utils import timeutils
from manila.i18n import _
from manila import policy
@enginefacade.transaction_context_provider
class RequestContext(context.RequestContext):
"""Security context and request information.

36
manila/db/sqlalchemy/api.py
View File

@ -23,7 +23,6 @@ import datetime
from functools import wraps
import ipaddress
import sys
import threading
import warnings
# NOTE(uglide): Required to override default oslo_db Query class
@ -34,7 +33,7 @@ from oslo_db import api as oslo_db_api
from oslo_db import exception as db_exc
from oslo_db import exception as db_exception
from oslo_db import options as db_options
from oslo_db.sqlalchemy import session
from oslo_db.sqlalchemy import enginefacade
from oslo_db.sqlalchemy import utils as db_utils
from oslo_log import log
from oslo_utils import excutils
@ -42,7 +41,6 @@ from oslo_utils import importutils
from oslo_utils import strutils
from oslo_utils import timeutils
from oslo_utils import uuidutils
import sqlalchemy
from sqlalchemy import and_
from sqlalchemy import MetaData
from sqlalchemy import or_
@ -60,7 +58,6 @@ from manila import exception
from manila.i18n import _
from manila import quota
osprofiler_sqlalchemy = importutils.try_import('osprofiler.sqlalchemy')
CONF = cfg.CONF
@ -72,42 +69,23 @@ QUOTAS = quota.QUOTAS
_DEFAULT_QUOTA_NAME = 'default'
PER_PROJECT_QUOTAS = []
_FACADE = None
_LOCK = threading.Lock()
_DEFAULT_SQL_CONNECTION = 'sqlite://'
db_options.set_defaults(cfg.CONF,
connection=_DEFAULT_SQL_CONNECTION)
context_manager = enginefacade.transaction_context()
def _create_facade_lazily():
global _LOCK, _FACADE
if _FACADE is None:
with _LOCK:
if _FACADE is None:
# FIXME(stephenfin): Remove autocommit=True (and ideally use of
# LegacyEngineFacade) asap since it's not compatible with
# SQLAlchemy 2.0
_FACADE = session.EngineFacade.from_config(
cfg.CONF,
autocommit=True,
)
if CONF.profiler.enabled and CONF.profiler.trace_sqlalchemy:
osprofiler_sqlalchemy.add_tracing(sqlalchemy,
_FACADE.get_engine(),
"db")
return _FACADE
# FIXME(stephenfin): we need to remove reliance on autocommit semantics ASAP
# since it's not compatible with SQLAlchemy 2.0
context_manager.configure(__autocommit=True)
def get_engine():
facade = _create_facade_lazily()
return facade.get_engine()
return context_manager._factory.get_legacy_facade().get_engine()
def get_session(**kwargs):
facade = _create_facade_lazily()
return facade.get_session(**kwargs)
return context_manager._factory.get_legacy_facade().get_session(**kwargs)
def get_backend():