[code sync] Merge code from sonic-net/sonic-utilities:202605 to 202608 - #427
Merged
Conversation
mssonicbld
commented
Aug 1, 2026
mssonicbld
commented
Collaborator
…(#4721) config reload can inherit a stale WARM_RESTART_ENABLE_TABLE|system=true flag left by an unfinished warm-boot or fast-reboot finalization (e.g. BGP reconcile still pending). syncd.sh::check_warm_boot() reads this flag and issues `syncd_request_shutdown --warm` without a preceding `--pre` (pre-shutdown). - Added a boot-in-progress guard in config/main.py (reload()) that uses swsscommon.RestartWaiter to detect if a warm-boot or fast-reboot is still finalizing; if so, config reload aborts with a clear message before syncd is stopped. - isFastBootInProgress is checked first: fast-reboot sets both FAST_RESTART_ENABLE_TABLE and WARM_RESTART_ENABLE_TABLE, so checking fast first ensures the correct label. - Guard is skipped when --no-service-restart (-n) is passed since no syncd teardown occurs in that path. - Added four inline tests in tests/config_test.py. (cherry picked from commit cd4953c3bcb92b56a2d0c288e0cd4cbb79b98f9d) Signed-off-by: Yizhen Zhang <evazha@nvidia.com>
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.