openstack
/
cinder
Code Issues Proposed changes

Merge "Modify the index migration slightly for backport"

This commit is contained in:
Jenkins 2014-07-28 06:14:37 +00:00 committed by Gerrit Code Review
parent dae6df44d2 08b9019008
commit 0ca525fe29
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cinder/db/sqlalchemy/migrate_repo/versions/023_add_expire_reservations_index.py
View File

@ -13,7 +13,12 @@
# under the License.
from sqlalchemy import Index, MetaData, Table
from sqlalchemy.exc import IntegrityError
from sqlalchemy.exc import OperationalError
from cinder.openstack.common.gettextutils import _
from cinder.openstack.common import log as logging
LOG = logging.getLogger(__name__)
def upgrade(migrate_engine):
@ -28,8 +33,9 @@ def upgrade(migrate_engine):
reservations.c.deleted, reservations.c.expire)
try:
index.create(migrate_engine)
except IntegrityError:
pass
except OperationalError:
LOG.info(_('Skipped adding reservations_deleted_expire_idx '
'because an equivalent index already exists.'))
def downgrade(migrate_engine):
@ -40,4 +46,8 @@ def downgrade(migrate_engine):
index = Index('reservations_deleted_expire_idx',
reservations.c.deleted, reservations.c.expire)
index.drop(migrate_engine)
try:
index.drop(migrate_engine)
except OperationalError:
LOG.info(_('Skipped removing reservations_deleted_expire_idx '
'because index does not exist.'))