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

[updategraph] enhance update graph handling (#3549)

Browse Source 
- after reloading minigraph, write latest version string in the DB.
- if old config_db.json file exists, use it and migrate to latest version.
- only reload minigraph when config_db.json doesn't exist and minigraph
  exists.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
This commit is contained in:
Ying Xie 2019-10-02 13:58:44 -07:00 committed by GitHub
parent d5262a3621
commit cd85e2148b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
files/image_config/updategraph/updategraph
View File

@ -62,13 +62,20 @@ if [ -f /tmp/pending_config_migration ]; then
copy_config_files_and_directories $copy_list copy_config_files_and_directories $copy_list
if [ x"${WARM_BOOT}" == x"true" ]; then if [ x"${WARM_BOOT}" == x"true" ]; then
echo "Warm reboot detected..." echo "Warm reboot detected..."
elif [ "$enabled" = "true" ]; then elif [ -r /etc/sonic/config_db.json ]; then
echo "Use config_db.json from old system..."
sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
if [[ -x /usr/bin/db_migrator.py ]]; then
# Migrate the DB to the latest schema version if needed
/usr/bin/db_migrator.py -o migrate
fi
elif [ -r /etc/sonic/minigraph.xml ]; then
echo "Use minigraph.xml from old system..." echo "Use minigraph.xml from old system..."
reload_minigraph reload_minigraph
sonic-cfggen -d --print-data > /etc/sonic/config_db.json sonic-cfggen -d --print-data > /etc/sonic/config_db.json
else else
echo "Use config_db.json from old system..." echo "Didn't found neither config_db.json nor minigraph.xml ..."
sonic-cfggen -j /etc/sonic/config_db.json --write-to-db
fi fi
rm -f /tmp/pending_config_migration rm -f /tmp/pending_config_migration
sed -i "/enabled=/d" /etc/sonic/updategraph.conf sed -i "/enabled=/d" /etc/sonic/updategraph.conf