625ecb610c
DB exceptions have moved to openstack/common/db/exception module so that they can be shared with multiple DB implementations. Deadlock checking was also added to oslo to consolidate with DuplicateKey checking. This allows us to clean up our _retry_on_deadlock decorator in sqlalchemy/api.py Fixes unrelated pep8 issue with duplicate test in test_compute also. Change-Id: I7e985b384d1ef345e0d67c919b84b4faff869699
66 lines
2.0 KiB
Python
66 lines
2.0 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright (c) 2012 NTT DOCOMO, INC.
|
|
# Copyright 2010 United States Government as represented by the
|
|
# Administrator of the National Aeronautics and Space Administration.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
"""Session Handling for SQLAlchemy backend."""
|
|
|
|
from oslo.config import cfg
|
|
|
|
from nova.openstack.common.db.sqlalchemy import session as nova_session
|
|
from nova import paths
|
|
|
|
opts = [
|
|
cfg.StrOpt('sql_connection',
|
|
default=('sqlite:///' +
|
|
paths.state_path_def('baremetal_$sqlite_db')),
|
|
help='The SQLAlchemy connection string used to connect to the '
|
|
'bare-metal database'),
|
|
]
|
|
|
|
baremetal_group = cfg.OptGroup(name='baremetal',
|
|
title='Baremetal Options')
|
|
|
|
CONF = cfg.CONF
|
|
CONF.register_group(baremetal_group)
|
|
CONF.register_opts(opts, baremetal_group)
|
|
|
|
CONF.import_opt('sqlite_db', 'nova.openstack.common.db.sqlalchemy.session')
|
|
|
|
_ENGINE = None
|
|
_MAKER = None
|
|
|
|
|
|
def get_session(autocommit=True, expire_on_commit=False):
|
|
"""Return a SQLAlchemy session."""
|
|
global _MAKER
|
|
|
|
if _MAKER is None:
|
|
engine = get_engine()
|
|
_MAKER = nova_session.get_maker(engine, autocommit, expire_on_commit)
|
|
|
|
session = _MAKER()
|
|
return session
|
|
|
|
|
|
def get_engine():
|
|
"""Return a SQLAlchemy engine."""
|
|
global _ENGINE
|
|
if _ENGINE is None:
|
|
_ENGINE = nova_session.create_engine(CONF.baremetal.sql_connection)
|
|
return _ENGINE
|