[acl] Make Config DB recovery more robust#2296
Merged
daall merged 2 commits intosonic-net:masterfrom Sep 30, 2020
Merged
Conversation
Signed-off-by: Danny Allen <[email protected]>
daall
commented
Sep 30, 2020
|
|
||
|
|
||
| @pytest.fixture | ||
| def backup_and_restore_config_db(duthost): |
Contributor
Author
There was a problem hiding this comment.
@bingwang-ms can you help me verify that this works OK for the advanced_reboot tests? It seemed fine to me but I think a second set of eyes would be helpful. :)
wangxin
approved these changes
Sep 30, 2020
Contributor
Author
|
retest vsimage please |
kazinator-arista
pushed a commit
to kazinator-arista/sonic-mgmt
that referenced
this pull request
Mar 4, 2026
Include following commits: ``` 839625d Replace cmp in acl_loader with operator.eq (sonic-net#2328) af245ad [route_check]: Ignore standalone tunnel routes (sonic-net#2332) c9aa65c Revert "[DHCPv6] [202012] Update the dhcpv6_relay config/show cli (sonic-net#2271)" (sonic-net#2336) 6b9cdc9 Made changes to only allow a valid IPv4 or Ipv6 string for dhcp cli (sonic-net#2296) ```
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.
Signed-off-by: Danny Allen [email protected]
Description of PR
Summary: Make Config DB recovery more robust
Fixes #2292
Type of change
Approach
What is the motivation for this PR?
It is possible for loganalyzer to throw an exception during table removal and never reach the
config save -ystep in the finally block. This leaves theconfig_db.jsonin a bad state, which can cause strange issues for downstream tests ifconfig reloador a reboot are issued.How did you do it?
I took advantage of the newly added
backup_and_restorefixture to restore theconfig_db.jsonrather than relying on thefinallyblock to work every time.How did you verify/test it?
Ran the test locally, verified that the
config_db.jsonwas the same before and after. Going to go back and validate this works for 201911 as well as master.Any platform specific information?
Supported testbed topology if it's a new test case?
Documentation