openstack/placement
Code Issues Proposed changes

Merge "Compact pre-Grizzly database migrations."

Browse Source
This commit is contained in:
Jenkins
2012-11-19 17:59:48 +00:00
committed by Gerrit Code Review
parent ac7b8028b6 d2c5a0f506
commit ee7ea832a8
4 changed files with 1 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nova/db/migration.py
View File

@@ -24,7 +24,7 @@ from nova import utils
IMPL = utils.LazyPluggable('db_backend',
sqlalchemy='nova.db.sqlalchemy.migration')
INIT_VERSION = 81
INIT_VERSION = 132
def db_sync(version=None):

72
nova/db/sqlalchemy/migrate_repo/versions/111_general_aggregates.py
View File

@@ -1,72 +0,0 @@
# Copyright 2012 OpenStack LLC.
#
# 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.
from sqlalchemy import String, Column, MetaData, Table, delete, select
from migrate.changeset import UniqueConstraint
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__)
def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
dialect = migrate_engine.url.get_dialect().name
aggregates = Table('aggregates', meta, autoload=True)
aggregate_metadata = Table('aggregate_metadata', meta, autoload=True)
record_list = list(aggregates.select().execute())
for rec in record_list:
row = aggregate_metadata.insert()
row.execute({'created_at': rec['created_at'],
'updated_at': rec['updated_at'],
'deleted_at': rec['deleted_at'],
'deleted': rec['deleted'],
'key': 'operational_state',
'value': rec['operational_state'],
'aggregate_id': rec['id'],
})
aggregates.drop_column('operational_state')
aggregate_hosts = Table('aggregate_hosts', meta, autoload=True)
if dialect.startswith('sqlite'):
aggregate_hosts.c.host.alter(unique=False)
elif dialect.startswith('postgres'):
ucon = UniqueConstraint('host',
name='aggregate_hosts_host_key',
table=aggregate_hosts)
ucon.drop()
else:
col = aggregate_hosts.c.host
UniqueConstraint(col, name='host').drop()
def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
aggregates = Table('aggregates', meta, autoload=True)
aggregate_metadata = Table('aggregate_metadata', meta, autoload=True)
operational_state = Column('operational_state', String(255))
aggregates.create_column(operational_state)
aggregates.update().values(operational_state=select(
[aggregate_metadata.c.value]).where(aggregates.c.id ==
aggregate_metadata.c.aggregate_id and aggregate_metadata.c.key ==
'operational_state')).execute()
delete(aggregate_metadata, aggregate_metadata.c.key == 'operational_state')
aggregates.c.operational_state.alter(nullable=False)
aggregate_hosts = Table('aggregate_hosts', meta, autoload=True)
aggregate_hosts.c.host.alter(unique=True)

42
nova/db/sqlalchemy/migrate_repo/versions/119_add_indexes_to_aggregate_metadata.py
View File

@@ -1,42 +0,0 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack LLC.
# 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.
from sqlalchemy import Index, MetaData, Table
from sqlalchemy.exc import IntegrityError
def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
# Based on aggregate_metadata_get_item
# from: nova/db/sqlalchemy/api.py
t = Table('aggregate_metadata', meta, autoload=True)
i = Index('aggregate_metadata_key_idx', t.c.key)
try:
i.create(migrate_engine)
except IntegrityError:
pass
def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
t = Table('aggregate_metadata', meta, autoload=True)
i = Index('aggregate_metadata_key_idx', t.c.key)
i.drop(migrate_engine)

48
nova/db/sqlalchemy/migrate_repo/versions/133_aggregate_delete_fix.py
View File

@@ -1,48 +0,0 @@
# Copyright 2012 OpenStack LLC.
#
# 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.
from sqlalchemy import String, Column, MetaData, Table
from migrate.changeset import UniqueConstraint
from nova.openstack.common import log as logging
LOG = logging.getLogger(__name__)
def upgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
dialect = migrate_engine.url.get_dialect().name
aggregates = Table('aggregates', meta, autoload=True)
if dialect.startswith('sqlite'):
aggregates.c.name.alter(unique=False)
elif dialect.startswith('postgres'):
ucon = UniqueConstraint('name',
name='aggregates_name_key',
table=aggregates)
ucon.drop()
else:
col2 = aggregates.c.name
UniqueConstraint(col2, name='name').drop()
def downgrade(migrate_engine):
meta = MetaData()
meta.bind = migrate_engine
aggregates = Table('aggregates', meta, autoload=True)
aggregates.c.name.alter(unique=True)