Skip to content
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

17.06 backport iptables output filter #2218

Merged

Conversation

ctelfer
Copy link
Contributor

@ctelfer ctelfer commented Jul 3, 2018

Backport of:

These fixes prevent libnetwork from returnning errors when iptables / firewalld outputs transient warnings while succeeding at its intended operations.

This gets filtered for raw iptables calls, but not from calls made
through firewalld.   The patch just ensures consistency of operation.
It also adds a warning when xtables contention detected and truncates
the search string slightly as it appears that the suffix will be
changing in the near future.

Signed-off-by: Chris Telfer <ctelfer@docker.com>
(cherry picked from commit 2fb05a3)
Signed-off-by: Chris Telfer <ctelfer@docker.com>
Signed-off-by: Chris Telfer <ctelfer@docker.com>
(cherry picked from commit 36847dd)
Signed-off-by: Chris Telfer <ctelfer@docker.com>
@ctelfer
Copy link
Contributor Author

ctelfer commented Jul 3, 2018

git checkout -b 17.06-backport-iptables-output-filter upstream/bump_17.06
git cherry-pick -s -x 2fb05a336d7 36847dd923
git push -u origin

@selansen
Copy link
Collaborator

selansen commented Jul 3, 2018

LGTM

Copy link

@fcrisciani fcrisciani left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@fcrisciani fcrisciani merged commit eb3ef59 into moby:bump_17.06 Jul 3, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants