matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix for fast/cold-boot: call db_migrator only after old config is loaded (#14933)" (#15464) (#15618)

Browse Source
This commit is contained in:
mssonicbld 2023-06-29 22:35:47 +08:00 committed by GitHub
parent d0126e679b
commit bb3eff6ab4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
files/build_templates/docker_image_ctl.j2
View File

@ -257,18 +257,10 @@ function postStartAction()
$SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1" $SONIC_DB_CLI CONFIG_DB SET "CONFIG_DB_INITIALIZED" "1"
fi fi
if [ -e /tmp/pending_config_migration ]; then if [[ -x /usr/local/bin/db_migrator.py ]]; then
# this is first boot to a new image, config-setup execution is pending. # Migrate the DB to the latest schema version if needed
# For fast/cold reboot case, DB contains nothing at this point if [ -z "$DEV" ]; then
# Call db_migrator after config-setup loads the config (from old config or minigraph) /usr/local/bin/db_migrator.py -o migrate
echo "Delaying db_migrator until config migration is over"
else
# 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
# Migrate the DB to the latest schema version if needed
if [ -z "$DEV" ]; then
/usr/local/bin/db_migrator.py -o migrate
fi
fi fi
fi fi
# Add redis UDS to the redis group and give read/write access to the group # Add redis UDS to the redis group and give read/write access to the group

13
files/image_config/config-setup/config-setup
View File

@ -304,16 +304,6 @@ check_all_config_db_present()
return 0 return 0
} }
# DB schema is subject to change between two images
# Perform DB schema migration after loading backup config from previous image
do_db_migration()
{
if [[ -x /usr/local/bin/db_migrator.py ]]; then
# Migrate the DB to the latest schema version if needed
/usr/local/bin/db_migrator.py -o migrate
fi
}
# Perform configuration migration from backup copy. # Perform configuration migration from backup copy.
# - This step is performed when a new image is installed and SONiC switch boots into it # - This step is performed when a new image is installed and SONiC switch boots into it
do_config_migration() do_config_migration()
@ -336,19 +326,16 @@ do_config_migration()
if [ x"${WARM_BOOT}" == x"true" ]; then if [ x"${WARM_BOOT}" == x"true" ]; then
echo "Warm reboot detected..." echo "Warm reboot detected..."
disable_updategraph disable_updategraph
do_db_migration
rm -f /tmp/pending_config_migration rm -f /tmp/pending_config_migration
exit 0 exit 0
elif check_all_config_db_present; then elif check_all_config_db_present; then
echo "Use config_db.json from old system..." echo "Use config_db.json from old system..."
reload_configdb reload_configdb
do_db_migration
# Disable updategraph # Disable updategraph
disable_updategraph disable_updategraph
elif [ -r ${MINGRAPH_FILE} ]; then elif [ -r ${MINGRAPH_FILE} ]; then
echo "Use minigraph.xml from old system..." echo "Use minigraph.xml from old system..."
reload_minigraph reload_minigraph
do_db_migration
# Disable updategraph # Disable updategraph
disable_updategraph disable_updategraph
else else