Enable migrating DB without seeding

Author: KevinMind

.github/actions/run-docker/action.yml

@@ -15,7 +15,7 @@ inputs:
   logs:
     description: 'Show logs'
     required: false
-  data_backup_skip:
+  skip_data_seed:
     description: 'Skip data backup'
     required: false
     default: 'true'
@@ -43,7 +43,7 @@ runs:
           DOCKER_TARGET="${{ inputs.target }}" \
           OLYMPIA_UID="$(id -u)" \
           OLYMPIA_DEPS="${{ inputs.deps }}" \
-          DATA_BACKUP_SKIP="${{ inputs.data_backup_skip }}" \
+          SKIP_DATA_SEED="${{ inputs.skip_data_seed }}" \
           DOCKER_WAIT="true"
 
 

.github/workflows/_test_check.yml

@@ -160,5 +160,4 @@ jobs:
       - uses: ./.github/actions/run-docker
         with:
           version: ${{ inputs.version }}
-          data_backup_skip: false
           run: echo true

.github/workflows/health_check.yml

@@ -25,7 +25,6 @@ jobs:
           target: development
           version: local
           logs: true
-          data_backup_skip: ''
           run: ./scripts/health_check.py --env ${{ matrix.environment }} --verbose
 
 

Makefile-os

@@ -14,7 +14,7 @@ DOCKER_WAIT ?=
 export DOCKER_COMMIT ?=
 export DOCKER_BUILD ?=
 export DOCKER_VERSION ?=
-export DATA_BACKUP_SKIP ?=
+export SKIP_DATA_SEED ?=
 override DOCKER_MYSQLD_VOLUME = addons-server_data_mysqld
 
 INITIALIZE_ARGS ?=

docker-compose.yml

@@ -21,7 +21,7 @@ x-env-mapping: &env
     - HISTCONTROL=erasedups
     - ENV=local
     - CIRCLECI
-    - DATA_BACKUP_SKIP
+    - SKIP_DATA_SEED
 
 x-olympia: &olympia
   <<: *env

settings.py

@@ -33,7 +33,7 @@
 DBBACKUP_CONNECTOR_MAPPING = {
     'olympia.core.db.mysql': 'dbbackup.db.mysql.MysqlDumpConnector',
 }
-DATA_BACKUP_SKIP = os.environ.get('DATA_BACKUP_SKIP', False)
+SKIP_DATA_SEED = os.environ.get('SKIP_DATA_SEED', False)
 
 # Override logging config to enable DEBUG logs for (almost) everything.
 LOGGING['root']['level'] = logging.DEBUG

src/olympia/amo/management/commands/initialize.py

@@ -46,32 +46,33 @@ def handle(self, *args, **options):
         # Always ensure "olympia" database exists and is accessible.
         call_command('monitors', services=['olympia_database', 'elastic'])
 
-        # If we are not skipping data backup
-        # then run the logic to ensure the DB is ready.
-        if not settings.DATA_BACKUP_SKIP:
-            # If DB empty or we are explicitly cleaning, then bail with data_seed.
-            if options.get('clean') or not self.local_admin_exists():
-                call_command('data_seed')
-            # Otherwise, we're working with a pre-existing DB.
+        if (
+            # If we are not skipping data seeding
+            not settings.SKIP_DATA_SEED
+            # and we are either explicitly cleaning or loading a fresh db
+            and (options.get('clean') or not self.local_admin_exists())
+        ):
+            call_command('data_seed')
+        # Otherwise, we're working with a pre-existing DB.
+        else:
+            load = options.get('load')
+            # We always migrate the DB.
+            logging.info('Migrating...')
+            call_command('migrate', '--noinput')
+
+            # If we specify a specific backup, simply load that.
+            if load:
+                call_command('data_load', '--name', load)
+            # We should reindex even if no data is loaded/modified
+            # because we might have a fresh instance of elasticsearch
             else:
-                load = options.get('load')
-                # We always migrate the DB.
-                logging.info('Migrating...')
-                call_command('migrate', '--noinput')
-
-                # If we specify a specific backup, simply load that.
-                if load:
-                    call_command('data_load', '--name', load)
-                # We should reindex even if no data is loaded/modified
-                # because we might have a fresh instance of elasticsearch
-                else:
-                    call_command(
-                        'reindex', '--wipe', '--force', '--noinput', '--skip-if-exists'
-                    )
-
-            # By now, we excpect the database to exist, and to be migrated
-            # so our database tables should be accessible
-            call_command('monitors', services=['database'])
+                call_command(
+                    'reindex', '--wipe', '--force', '--noinput', '--skip-if-exists'
+                )
+
+        # By now, we excpect the database to exist, and to be migrated
+        # so our database tables should be accessible
+        call_command('monitors', services=['database'])
 
         # Ensure that the storage directories exist.
         self.make_storage(clean=False)

src/olympia/amo/tests/test_commands.py

@@ -237,7 +237,7 @@ def _assert_commands_called_in_order(self, mock_call_command, expected_commands)
         )
 
 
-@override_settings(DATA_BACKUP_SKIP=False)
+@override_settings(SKIP_DATA_SEED=False)
 class TestInitializeDataCommand(BaseTestDataCommand):
     def setUp(self):
         super().setUp()
@@ -262,34 +262,40 @@ def with_local_admin(self):
             username=settings.LOCAL_ADMIN_USERNAME, email=settings.LOCAL_ADMIN_EMAIL
         )
 
-    @override_settings(DATA_BACKUP_SKIP=True)
+    @override_settings(SKIP_DATA_SEED=True)
     def test_handle_with_skip_data_initialize(self):
         """
-        Test running the 'initialize' command with the DATA_BACKUP_SKIP flag set.
-        Expected: nothing happens except verifying the dependencies.
+        Test running the 'initialize' command with the SKIP_DATA_SEED flag set.
+        Expected: Run migrations and reindex.
         """
         call_command('initialize')
         self._assert_commands_called_in_order(
             self.mocks['mock_call_command'],
             [
                 self.mock_commands.monitors_olympia_database,
+                self.mock_commands.migrate,
+                self.mock_commands.reindex_skip_if_exists,
+                self.mock_commands.monitors_database,
                 self.mock_commands.monitors,
                 self.mock_commands.check,
             ],
         )
 
-    @override_settings(DATA_BACKUP_SKIP=True)
+    @override_settings(SKIP_DATA_SEED=True)
     def test_handle_with_load_argument_and_skip_data_initialize(self):
         """
         Test running the 'initialize' command with both '--load' argument
-        and DATA_BACKUP_SKIP flag. Expected:
-        nothing happens except verifying the dependencies.
+        and SKIP_DATA_SEED flag. Expected:
+        Run data migration and load the specified backup.x
         """
         call_command('initialize', load='test')
         self._assert_commands_called_in_order(
             self.mocks['mock_call_command'],
             [
                 self.mock_commands.monitors_olympia_database,
+                self.mock_commands.migrate,
+                self.mock_commands.data_load('test'),
+                self.mock_commands.monitors_database,
                 self.mock_commands.monitors,
                 self.mock_commands.check,
             ],

tests/make/make.spec.js

@@ -71,7 +71,7 @@ describe('docker-compose.yml', () => {
       DOCKER_TARGET,
       DOCKER_VERSION,
       DEBUG: 'debug',
-      DATA_BACKUP_SKIP: 'skip',
+      SKIP_DATA_SEED: 'skip',
     };
 
     it('.services.(web|worker) should have the correct configuration', () => {