[config reload] Fixing config reload when timer based services are disabled#2200
Merged
liat-grozovik merged 2 commits intosonic-net:masterfrom Jun 19, 2022
Merged
Conversation
stepanblyschak
previously approved these changes
Jun 8, 2022
Merged
5 tasks
…sabled Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
dgsudharsan
force-pushed
the
config_rel_fix
branch
from
86e203c to
ee44cb2
Compare
qiluo-msft
reviewed
Jun 16, 2022
config/main.py
Outdated
| if not _delay_timers_elapsed(): | ||
| click.echo("Relevant services are not up. Retry later or use -f to avoid system checks") | ||
| return | ||
| sys.exit(1) |
Contributor
Collaborator
Author
There was a problem hiding this comment.
All these three error conditions are identical which are meant to signal config reload is not ready to be executed. The appropriate error message would give user the hint why it is not ready. I believe since they are for the same behavior the same exit code should be used.
Please let me know your thoughts.
Contributor
There was a problem hiding this comment.
Could you define a constant for "config reload is not ready to be executed" return code?
qiluo-msft
approved these changes
Jun 16, 2022
Collaborator
Author
|
@qiluo-msft Can we merge this? |
liat-grozovik
pushed a commit
that referenced
this pull request
Jun 19, 2022
…s are disabled (#2201) 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. Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
Contributor
|
@dgsudharsan this change cannot be cherry-picked cleanly to 202205 branch, as result, I also cannot cherry-pick sonic-net/sonic-swss#2143 into 202205 at this time. |
Collaborator
Author
@yxieca I will raise a PR for 202205. But can you explain me how this PR is affecting the sonic-swss PR you mentioned? |
dgsudharsan
added a commit
to dgsudharsan/sonic-utilities
that referenced
this pull request
Jun 21, 2022
…sabled (sonic-net#2200) - 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. Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
Collaborator
Author
Here is the PR #2226 |
yxieca
pushed a commit
that referenced
this pull request
Jun 22, 2022
…sabled (#2200) (#2226) - 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. Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
yxieca
pushed a commit
that referenced
this pull request
Jun 22, 2022
…sabled (#2200) (#2226) - 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. Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
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
5 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.
Signed-off-by: Sudharsan Dhamal Gopalarathnam [email protected]
DO NOT MERGE UNTIL sonic-net/sonic-mgmt#5783 IS MERGED
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)