31613b3ab5
This sync contains the following commits from olso-incubator: 7959826 db: move all options into database group dda24eb Introduce mysql_sql_mode option, remove old warning 0b5af67 Introduce a method to set any MySQL session SQL mode 8dccc7b Handle ibm_db_sa DBDuplicateEntry integrity errors 0f24d82 Fix migration.db_version when no tables ac84a40 Update log translation domains c0d357b Add model_query() to db.sqlalchemy.utils module 84254fc Fix a small typo in api.py b8a676c Remove CONF.database.connection default value 86707cd Remove None for dict.get() 0545121 Fix duplicating of SQL queries in logs fcf517d Update oslo log messages with translation domains fa05b7c Restore the ability to load the DB backend lazily 630d395 Don't use cfg.CONF in oslo.db ce69e7f Don't store engine instances in oslo.db 35dc1d7 py3kcompat: remove b4f72b2 Don't raise MySQL 2013 'Lost connection' errors 271adfb Format sql in db.sqlalchemy.session docstring 0334cb3 Handle exception messages with six.text_type eff69ce Drop dependency on log from oslo db code 7a11a04 Automatic retry db.api query if db connection lost 11f2add Clean up docstring in db.sqlalchemy.session 1b5147f Only enable MySQL TRADITIONAL mode if we're running against MySQL 39e1c5c Move db tests base.py to common code 986dafd Fix parsing of UC errors in sqlite 3.7.16+/3.8.2+ bcf6d5e Small edits on help strings ae01e9a Transition from migrate to alembic Due to API changes in oslo.db code we have to change Nova code a bit in order to reuse oslo-incubator changes (oslo.db no longer stores SQLAlchemy Engine and sessionmaker instances globally and it's up to applications to create them). Change-Id: I4aaa7151f66e0292ff66c29330f93d78c6bf78a6
88 lines
2.8 KiB
Python
88 lines
2.8 KiB
Python
# 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.
|
|
|
|
import os
|
|
|
|
from migrate import exceptions as versioning_exceptions
|
|
from migrate.versioning import api as versioning_api
|
|
from migrate.versioning.repository import Repository
|
|
import sqlalchemy
|
|
|
|
from nova.db.sqlalchemy import api as db_session
|
|
from nova import exception
|
|
from nova.openstack.common.gettextutils import _
|
|
|
|
INIT_VERSION = 215
|
|
_REPOSITORY = None
|
|
|
|
get_engine = db_session.get_engine
|
|
|
|
|
|
def db_sync(version=None):
|
|
if version is not None:
|
|
try:
|
|
version = int(version)
|
|
except ValueError:
|
|
raise exception.NovaException(_("version should be an integer"))
|
|
|
|
current_version = db_version()
|
|
repository = _find_migrate_repo()
|
|
if version is None or version > current_version:
|
|
return versioning_api.upgrade(get_engine(), repository, version)
|
|
else:
|
|
return versioning_api.downgrade(get_engine(), repository,
|
|
version)
|
|
|
|
|
|
def db_version():
|
|
repository = _find_migrate_repo()
|
|
try:
|
|
return versioning_api.db_version(get_engine(), repository)
|
|
except versioning_exceptions.DatabaseNotControlledError:
|
|
meta = sqlalchemy.MetaData()
|
|
engine = get_engine()
|
|
meta.reflect(bind=engine)
|
|
tables = meta.tables
|
|
if len(tables) == 0:
|
|
db_version_control(INIT_VERSION)
|
|
return versioning_api.db_version(get_engine(), repository)
|
|
else:
|
|
# Some pre-Essex DB's may not be version controlled.
|
|
# Require them to upgrade using Essex first.
|
|
raise exception.NovaException(
|
|
_("Upgrade DB using Essex release first."))
|
|
|
|
|
|
def db_initial_version():
|
|
return INIT_VERSION
|
|
|
|
|
|
def db_version_control(version=None):
|
|
repository = _find_migrate_repo()
|
|
versioning_api.version_control(get_engine(), repository, version)
|
|
return version
|
|
|
|
|
|
def _find_migrate_repo():
|
|
"""Get the path for the migrate repository."""
|
|
global _REPOSITORY
|
|
path = os.path.join(os.path.abspath(os.path.dirname(__file__)),
|
|
'migrate_repo')
|
|
assert os.path.exists(path)
|
|
if _REPOSITORY is None:
|
|
_REPOSITORY = Repository(path)
|
|
return _REPOSITORY
|