[config reload][202111] Fixing config reload when timer based services are disabled#2201
Merged
liat-grozovik merged 2 commits intosonic-net:202111from Jun 19, 2022
Merged
Conversation
stepanblyschak
approved these changes
Jun 8, 2022
…sabled Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
dgsudharsan
force-pushed
the
config_rel_2111
branch
from
de4df8d to
b38f8bc
Compare
Collaborator
Author
|
@qiluo-msft @judyjoseph Can we get this approved? The main PR is approved by @qiluo-msft |
qiluo-msft
approved these changes
Jun 17, 2022
Collaborator
Author
|
@qiluo-msft Can we merge this? |
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
4 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.
Porting of #2200 into 202111
What I did
Fixed config reload when timer based delayed services are disabled. When they are disabled, the property property=LastTriggerUSecMonotonic returns "0". This will cause config reload to fail even though all enabled services are up.
How I did it
Fixed the delayed services logic to check if the services are enabled before getting the property LastTriggerUSecMonotonic . Additionally fixed the return codes when config reload fails due to system checks
How to verify it
Added UT to verify it. Modified sonic-mgmt tests to verify it additionally.
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)