Skip to content

Commit 181eb02

Browse files
vivekrnvmssonicbld
authored andcommitted
Run db_migrator for non first-time reboots (#16116)
- Why I did it The recent change #15685 (comment) removed the db migration for non first reboots. This is problematic for many deployments which doesn't rely on ZTP and push a custom config_db.json Port to older branches after #15685 is ported back - How I did it Re-introduce the logic to run the db_migrator on non-first boots - How to verify it Verified reboot and warm-reboot cases Signed-off-by: Vivek Reddy Karri <[email protected]>
1 parent 4310b48 commit 181eb02

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

files/build_templates/docker_image_ctl.j2

+9
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,18 @@ function postStartAction()
257257
# This flag will be set to "1" after DB migration/initialization is completed as part of config-setup
258258
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "0"
259259
else
260+
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "0"
261+
# this is not a first time boot to a new image. Datbase container starts w/ old pre-existing config
262+
if [[ -x /usr/local/bin/db_migrator.py ]]; then
263+
# Migrate the DB to the latest schema version if needed
264+
if [ -z "$DEV" ]; then
265+
/usr/local/bin/db_migrator.py -o migrate
266+
fi
267+
fi
260268
# set CONFIG_DB_INITIALIZED to indicate end of config load and migration
261269
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
262270
fi
271+
263272
# Add redis UDS to the redis group and give read/write access to the group
264273
REDIS_SOCK="/var/run/redis${DEV}/redis.sock"
265274
else

0 commit comments

Comments
 (0)