libnetwork/iptables: ProgramChain: don't fail if interface not found#46245
Merged
thaJeztah merged 1 commit intomoby:masterfrom Aug 23, 2023
Merged
libnetwork/iptables: ProgramChain: don't fail if interface not found#46245thaJeztah merged 1 commit intomoby:masterfrom
thaJeztah merged 1 commit intomoby:masterfrom
Conversation
DelInterfaceFirewalld returns an error if the interface to delete was not found. Let's ignore cases where we were successfully able to get the list of interfaces in the zone, but the interface was not part of the zone. This patch changes the error for these cases to an errdefs.ErrNotFound, and updates IPTable.ProgramChain to ignore those errors. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
4 tasks
Member
|
Out of curiosity, when does this happen? Is there a situation where this is likely to happen, or are we just trying to be more defensive against an obscure scenario where all we can do is shrug and move on? |
Member
Author
|
It's mostly defensive here; there's a lot of code in libnetwork that either ignores failures (which could be "failed to ADD the interface to the zone"), or "if the machine is not in state X" (e.g. firewalld not running), then we skip; here's how this is currently used; if firewalldRunning {
if enable {
if err := AddInterfaceFirewalld(bridgeName); err != nil {
return err
}
} else {
if err := DelInterfaceFirewalld(bridgeName); err != nil {
return err
}
}
}But For a cleanup operation, I'd consider "removing what isn't there" to be something we can safely ignore. |
neersighted
approved these changes
Aug 23, 2023
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
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.
DelInterfaceFirewalld returns an error if the interface to delete was not found. Let's ignore cases where we were successfully able to get the list of interfaces in the zone, but the interface was not part of the zone.
This patch changes the error for these cases to an errdefs.ErrNotFound, and updates IPTable.ProgramChain to ignore those errors.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)