Copy missing values from INIT_CFG to config_db during db_migration #1522
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
shi-su
approved these changes
Mar 24, 2021
yxieca
approved these changes
Mar 24, 2021
stepanblyschak
added a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
May 18, 2021
This change is in addition to sonic-net#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
stepanblyschak
added a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
May 18, 2021
This change is in addition to sonic-net#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
stepanblyschak
added a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
May 18, 2021
…one. This change is in addition to sonic-net#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
yxieca
pushed a commit
that referenced
this pull request
Jun 3, 2021
#1637) * [201911][db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to #1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
yxieca
pushed a commit
that referenced
this pull request
Jun 3, 2021
… one. (#1636) * [db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to #1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
yxieca
pushed a commit
that referenced
this pull request
Jun 3, 2021
) * [db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to #1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
gitsabari
pushed a commit
to gitsabari/sonic-utilities
that referenced
this pull request
Jun 15, 2021
…nic-net#1635) * [db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to sonic-net#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
raphaelt-nvidia
pushed a commit
to raphaelt-nvidia/sonic-utilities
that referenced
this pull request
Aug 10, 2021
…nic-net#1635) * [db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to sonic-net#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
stepanblyschak
pushed a commit
to stepanblyschak/sonic-utilities
that referenced
this pull request
Apr 28, 2022
Copy missing values from INIT_CFG to config_db during db_migration (sonic-net#1522) Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
malletvapid23
added a commit
to malletvapid23/Sonic-Utility
that referenced
this pull request
Aug 3, 2023
…635) * [db_migrator] fix old 1911 feature config migration to a new one. This change is in addition to sonic-net/sonic-utilities#1522. The init_cfg.json may have important fields added to configuration, while in previous fix these entries will not be added when table already exists. This change fixes this behaviour. Also, in order to preserve users auto_restart configuration a special logic for migrating CONTAINER_FEATURE table has been implemented. A test to cover this scenario is added. Signed-off-by: Stepan Blyschak <stepanb@nvidia.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Fixes: sonic-net/sonic-buildimage#6659
This PR is to port a fix into 201911 branch that is already available in master branch. Original fix for master branch is here - #1209
FEATURE table is a part of 201911 image database, but absent in 201811 images. The warm upgrade from 201811 image to 201911 image fails as the feature table is missing in the DB and multiple errors are seen in syslog.
This PR fixes DB_MIGRATOR code to update missing init_cfg tables into config_db.
How I did it
Iterate through the tables in /etc/sonic/init_cfg.json, if a table is found missing in configDB, update the configDB with the missing table. Otherwise, ignore it, so to avoid overriding configDB tables with init_cfg.
How to verify it
Verified upgrade with the fix in 201911 image, and the error is not seen.
Previous command output (if the output of a command-line utility has changed)
New command output (if the output of a command-line utility has changed)