Merge "db: Compact Train database migrations"

Author: Zuul

nova/db/sqlalchemy/migrate_repo/versions/392_placeholder.py

@@ -675,6 +675,13 @@ def upgrade(migrate_engine):
             'locked_by', Enum('owner', 'admin', name='instances0locked_by')),
         Column('cleaned', Integer, default=0),
         Column('ephemeral_key_uuid', String(36)),
+        # NOTE(danms): This column originally included default=False. We
+        # discovered in bug #1862205 that this will attempt to rewrite
+        # the entire instances table with that value, which can time out
+        # for large data sets (and does not even abort).
+        # NOTE(stephenfin): This was originally added by sqlalchemy-migrate
+        # which did not generate the constraints
+        Column('hidden', Boolean(create_constraint=False)),
         Index('uuid', 'uuid', unique=True),
         UniqueConstraint('uuid', name='uniq_instances0uuid'),
         mysql_engine='InnoDB',
@@ -732,6 +739,8 @@ def upgrade(migrate_engine):
         Column('keypairs', Text, nullable=True),
         Column('device_metadata', Text, nullable=True),
         Column('trusted_certs', Text, nullable=True),
+        Column('vpmems', Text, nullable=True),
+        Column('resources', Text, nullable=True),
         mysql_engine='InnoDB',
         mysql_charset='utf8',
     )
@@ -811,6 +820,13 @@ def upgrade(migrate_engine):
         Column('disk_processed', BigInteger, nullable=True),
         Column('disk_remaining', BigInteger, nullable=True),
         Column('uuid', String(36)),
+        # NOTE(stephenfin): This was originally added by sqlalchemy-migrate
+        # which did not generate the constraints
+        Column(
+            'cross_cell_move', Boolean(create_constraint=False),
+            default=False),
+        Column('user_id', String(255), nullable=True),
+        Column('project_id', String(255), nullable=True),
         Index('migrations_uuid', 'uuid', unique=True),
         mysql_engine='InnoDB',
         mysql_charset='utf8'

nova/db/sqlalchemy/migrate_repo/versions/393_placeholder.py

@@ -29,7 +29,7 @@
 from nova.i18n import _
 
 INIT_VERSION = {}
-INIT_VERSION['main'] = 390
+INIT_VERSION['main'] = 401
 INIT_VERSION['api'] = 0
 _REPOSITORY = {}
 

nova/db/sqlalchemy/migrate_repo/versions/394_placeholder.py

@@ -162,13 +162,11 @@ def _skippable_migrations(self):
             self.INIT_VERSION + 1,
         ]
 
-        stein_placeholders = list(range(392, 397))
         train_placeholders = list(range(403, 408))
         ussuri_placeholders = list(range(408, 413))
         victoria_placeholders = list(range(413, 418))
 
         return (special +
-                stein_placeholders +
                 train_placeholders +
                 ussuri_placeholders +
                 victoria_placeholders)
@@ -226,36 +224,6 @@ def removed_column(element):
     def test_walk_versions(self):
         self.walk_versions(snake_walk=False, downgrade=False)
 
-    def _check_397(self, engine, data):
-        for prefix in ('', 'shadow_'):
-            self.assertColumnExists(
-                engine, '%smigrations' % prefix, 'cross_cell_move')
-
-    def _check_398(self, engine, data):
-        self.assertColumnExists(engine, 'instance_extra', 'vpmems')
-        self.assertColumnExists(engine, 'shadow_instance_extra', 'vpmems')
-
-    def _check_399(self, engine, data):
-        for prefix in ('', 'shadow_'):
-            self.assertColumnExists(
-                engine, '%sinstances' % prefix, 'hidden')
-
-    def _check_400(self, engine, data):
-        # NOTE(mriedem): This is a dummy migration that just does a consistency
-        # check. The actual test for 400 is in TestServicesUUIDCheck.
-        pass
-
-    def _check_401(self, engine, data):
-        for prefix in ('', 'shadow_'):
-            self.assertColumnExists(
-                engine, '%smigrations' % prefix, 'user_id')
-            self.assertColumnExists(
-                engine, '%smigrations' % prefix, 'project_id')
-
-    def _check_402(self, engine, data):
-        self.assertColumnExists(engine, 'instance_extra', 'resources')
-        self.assertColumnExists(engine, 'shadow_instance_extra', 'resources')
-
 
 class TestNovaMigrationsSQLite(NovaMigrationsCheckers,
                                test_fixtures.OpportunisticDBTestMixin,