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

[18.03] Possible race on ingress programming #2181

Merged
merged 1 commit into from
Jun 8, 2018

Conversation

thaJeztah
Copy link
Member

backport of #2178 for the bump18.03 branch

git checkout -b 18.03-backport-race-ingress upstream/bump_18.03
git cherry-pick -s -S -x 7bb62d0172f8e676388d4d78e510c4d9fd4c1d06
git push -u origin

no conflicts

Make sure that iptables operations on ingress
are serialized.
Before 2 racing routines trying to create the ingress chain
were allowed and one was failing reporting the chain as
already existing.
The lock guarantees that this condition does not happen anymore

Signed-off-by: Flavio Crisciani flavio.crisciani@docker.com
(cherry picked from commit 7bb62d0)
Signed-off-by: Sebastiaan van Stijn github@gone.nl

Make sure that iptables operations on ingress
are serialized.
Before 2 racing routines trying to create the ingress chain
were allowed and one was failing reporting the chain as
already existing.
The lock guarantees that this condition does not happen anymore

Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com>
(cherry picked from commit 7bb62d0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
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

@codecov-io
Copy link

Codecov Report

❗ No coverage uploaded for pull request base (bump_18.03@3931ba4). Click here to learn what that means.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##             bump_18.03   #2181   +/-   ##
============================================
  Coverage              ?   40.6%           
============================================
  Files                 ?     139           
  Lines                 ?   22484           
  Branches              ?       0           
============================================
  Hits                  ?    9129           
  Misses                ?   12024           
  Partials              ?    1331
Impacted Files Coverage Δ
service_linux.go 3.2% <0%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3931ba4...6fc151f. Read the comment docs.

@fcrisciani fcrisciani merged commit 8300c53 into moby:bump_18.03 Jun 8, 2018
@thaJeztah thaJeztah deleted the 18.03-backport-race-ingress branch June 8, 2018 21:09
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.

3 participants