-
Notifications
You must be signed in to change notification settings - Fork 680
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
Skip the validation of action in acl-loader if capability table in STATE_DB is empty #3199
Merged
bingwang-ms
merged 2 commits into
sonic-net:master
from
bingwang-ms:skip_action_validation
Mar 11, 2024
Merged
Skip the validation of action in acl-loader if capability table in STATE_DB is empty #3199
bingwang-ms
merged 2 commits into
sonic-net:master
from
bingwang-ms:skip_action_validation
Mar 11, 2024
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
MSADO 27110039 |
Blueve
approved these changes
Mar 9, 2024
lizhijianrd
approved these changes
Mar 9, 2024
hi @bingwang-ms, could you run test with 202305 image? |
mssonicbld
pushed a commit
to mssonicbld/sonic-utilities
that referenced
this pull request
Mar 11, 2024
…ATE_DB is empty (sonic-net#3199) * Add skip_action_validation option to acl-loader
Cherry-pick PR to 202311: #3207 |
Yes, the test has been done on 202305 image by manually cherry-pick and run the image upgrade. |
mssonicbld
pushed a commit
that referenced
this pull request
Mar 11, 2024
…ATE_DB is empty (#3199) * Add skip_action_validation option to acl-loader
mssonicbld
pushed a commit
to mssonicbld/sonic-utilities
that referenced
this pull request
Mar 13, 2024
…ATE_DB is empty (sonic-net#3199) * Add skip_action_validation option to acl-loader
Cherry-pick PR to 202305: #3214 |
mssonicbld
pushed a commit
that referenced
this pull request
Mar 13, 2024
…ATE_DB is empty (#3199) * Add skip_action_validation option to acl-loader
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What I did
This PR is to fix a racing condition in system bootup path.
In the system bootup path,
config-setup
service will callconfig load_minigraph
if it's the first startup, and then/etc/sonic/acl.json
is loaded byconfig load_minigraph
.If
orchagent
hasn't writtenACL_STAGE_CAPABILITY_TABLE
orSWITCH_CAPABILITY_TABLE
intoSTATE_DB
before being terminated, then the dataplane ACL rules defined in/etc/sonic/acl.json
is skipped.This PR is to fix the racing condition by adding an option
skip_action_validation
toacl-loader
. If the optionskip_action_validation
is true, andACL_STAGE_CAPABILITY_TABLE
orSWITCH_CAPABILITY_TABLE
is empty, the action validation is skipped.How I did it
This PR added an option
skip_action_validation
toacl-loader
. If the optionskip_action_validation
is true, andACL_STAGE_CAPABILITY_TABLE
orSWITCH_CAPABILITY_TABLE
is empty, the action validation is skipped.How to verify it
The rules are loaded successfully after reloading.
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)
The help info changed.