-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
Revert "Revert "Fix for fast/cold-boot: call db_migrator only after old config is loaded"" #15684
Merged
yxieca
merged 2 commits into
sonic-net:master
from
vaibhavhd:revert-15464-revert-14933-db-migrator-fix
Jul 7, 2023
Merged
Revert "Revert "Fix for fast/cold-boot: call db_migrator only after old config is loaded"" #15684
yxieca
merged 2 commits into
sonic-net:master
from
vaibhavhd:revert-15464-revert-14933-db-migrator-fix
Jul 7, 2023
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
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" This reverts commit 9649a44.
11 tasks
yxieca
approved these changes
Jul 6, 2023
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Jul 7, 2023
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" (sonic-net#15684) This reverts commit 9649a44.
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Jul 7, 2023
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" (sonic-net#15684) This reverts commit 9649a44.
Cherry-pick PR to 202211: #15745 |
Cherry-pick PR to 202205: #15746 |
mssonicbld
added a commit
that referenced
this pull request
Jul 7, 2023
mssonicbld
added
Included in 202211 Branch
and removed
Approved for 202211 Branch
Created PR to 202211 Branch
labels
Jul 7, 2023
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Aug 14, 2023
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" (sonic-net#15684) This reverts commit 9649a44.
Cherry-pick PR to 202305: #16134 |
@vaibhavhd PR conflicts with 202211 branch |
10 tasks
mssonicbld
pushed a commit
that referenced
this pull request
Aug 14, 2023
mssonicbld
added
Included in 202305 Branch
and removed
Created PR to 202305 Branch
labels
Aug 14, 2023
@qiluo-msft , please pick this PR to 202012 branch. Please let me know if a separate PR is needed. |
Cherry-pick PR to 202012: #16223 |
mssonicbld
pushed a commit
to mssonicbld/sonic-buildimage
that referenced
this pull request
Aug 21, 2023
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" (sonic-net#15684) This reverts commit 9649a44.
10 tasks
mssonicbld
added a commit
that referenced
this pull request
Aug 21, 2023
mssonicbld
added
Included in 202012 Branch
and removed
Approved for 202012 Branch
Created PR to 202012 Branch
labels
Aug 21, 2023
sonic-otn
pushed a commit
to sonic-otn/sonic-buildimage
that referenced
this pull request
Sep 20, 2023
…ld config is loaded (sonic-net#14933)" (sonic-net#15464)" (sonic-net#15684) This reverts commit 9649a44.
lixiaoyuner
pushed a commit
to lixiaoyuner/sonic-buildimage
that referenced
this pull request
Feb 6, 2024
Related work items: sonic-net#94, sonic-net#13789, sonic-net#14149, sonic-net#14515, sonic-net#14788, sonic-net#14922, sonic-net#14933, sonic-net#15284, sonic-net#15383, sonic-net#15464, sonic-net#15519, sonic-net#15521, sonic-net#15575, sonic-net#15636, sonic-net#15652, sonic-net#15684, sonic-net#15708, sonic-net#15725, sonic-net#15739, sonic-net#15755, sonic-net#15756, sonic-net#15757
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
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.
Reverts #15464
Adds original PR back: #14933
Why I did it
Fix the issue where db_migrator is called before DB is loaded w/ config. This leads to db_migrator:
This is not expected. migration should happen after the old config is loaded and only new schema changes need migration.
The reason for incorrect call is that:
Requires=database.service
.Fixed by:
pending_config_migration
flag.pending_config_migration
is enabled, then do not call db_migrator as part of database service startup.Error that's being fixed:
Work item tracking
How I did it
How to verify it
ested on physical platform. Rebooted from 202012 to master image (new install):
db_migrator now gets delayed during database service bring up: Delaying db_migrator until config migration is over
db_migrator now gets called when config-setup service loads DB. The issue of migrating on empty DB is fixed and is evident as the previous error of hwsku being None is not seen anymore:
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)