Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Run db_migrator for non first-time reboots #16116

Merged
merged 12 commits into from
Aug 22, 2023
Merged

Run db_migrator for non first-time reboots #16116

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fcc52d5
Run db_migrator for non first-time reboots
vivekrnv Aug 11, 2023
861a3db
Add the INIT flag before running db-migrator
vivekrnv Aug 11, 2023
7cfa2f3
Minor mistake
vivekrnv Aug 11, 2023
a225182
Merge branch 'sonic-net:master' into db_mig_succesive_boot
vivekrnv Aug 11, 2023
fb542cb
Merge branch 'master' of https://github.com/Azure/sonic-buildimage in…
vivekrnv Aug 14, 2023
0301063
Move the db migration in all cases to config-setup
vivekrnv Aug 14, 2023
e7c8d00
Merge branch 'sonic-net:master' into db_mig_succesive_boot
vivekrnv Aug 15, 2023
12bb1bb
Merge branch 'sonic-net:master' into db_mig_succesive_boot
vivekrnv Aug 15, 2023
ddc222a
Merge branch 'sonic-net:master' into db_mig_succesive_boot
vivekrnv Aug 17, 2023
5aabb84
Merge branch 'sonic-net:master' into db_mig_succesive_boot
vivekrnv Aug 21, 2023
e3804ac
Move the migration back to db.service
vivekrnv Aug 22, 2023
682f836
Merge branch 'db_mig_succesive_boot' of github.com:vivekrnv/sonic-bui…
vivekrnv Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions files/build_templates/docker_image_ctl.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,18 @@ function postStartAction()
# This flag will be set to "1" after DB migration/initialization is completed as part of config-setup
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "0"
else
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "0"
# this is not a first time boot to a new image. Datbase container starts w/ old pre-existing config
if [[ -x /usr/local/bin/db_migrator.py ]]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am thinking if we not follow the same flow as we had earlier. Rather than that, why not confine all the migration logic in one place - config-setup.service?

This would ensure that migration also happens after the DB is loaded w/ relevant config - from minigraph, old config, new pushed config, etc.

Specifically, I am asking that this db_migrator call be moved here as part of new else block:

sonic-buildimage/files/image_config/config-setup/config-setup

Line 370 in c05af46

if [ -e /tmp/pending_config_migration ] || [ -e ${CONFIG_SETUP_POST_MIGRATION_FLAG} ]; then

and to

sonic-buildimage/files/image_config/config-setup/config-setup

Line 382 in c05af46

if [ -e /tmp/pending_config_initialization ] || [ -e ${CONFIG_SETUP_INITIALIZATION_FLAG} ]; then

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to run it here since the config_db.json has to be loaded first. If we move this to config-setup, this can't be guaranteed.

https://github.com/sonic-net/sonic-buildimage/pull/16116/files#diff-130e5ab75471398db06b73a4c6e4b56517f42e3c1f17870b5309620fc0e2fafbR247

# Migrate the DB to the latest schema version if needed
if [ -z "$DEV" ]; then
/usr/local/bin/db_migrator.py -o migrate
fi
fi
# set CONFIG_DB_INITIALIZED to indicate end of config load and migration
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
fi

# Add redis UDS to the redis group and give read/write access to the group
REDIS_SOCK="/var/run/redis${DEV}/redis.sock"
else
Expand Down