Skip to content

eni: Fix potential deadlock#11831

Merged
borkmann merged 1 commit intocilium:masterfrom
christarazi:pr/christarazi/fix-deadlock-eni
Jun 2, 2020
Merged

eni: Fix potential deadlock#11831
borkmann merged 1 commit intocilium:masterfrom
christarazi:pr/christarazi/fix-deadlock-eni

Conversation

@christarazi
Copy link
Copy Markdown
Member

Fixes: #11825
Fixes: ef77a98 ("eni: Fix data races and potential deadlock")

Fixes: cilium#11825
Fixes: ef77a98 ("eni: Fix data races and potential deadlock")

Signed-off-by: Chris Tarazi <chris@isovalent.com>
@christarazi christarazi requested a review from a team as a code owner June 2, 2020 16:46
@christarazi christarazi added area/eni Impacts ENI based IPAM. kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium. labels Jun 2, 2020
@maintainer-s-little-helper
Copy link
Copy Markdown

Please set the appropriate release note label.

@christarazi
Copy link
Copy Markdown
Member Author

christarazi commented Jun 2, 2020

test-me-please

Edit: 4.9 hit known flake: #11634

@coveralls
Copy link
Copy Markdown

Coverage Status

Coverage increased (+0.007%) to 36.895% when pulling 0e6d653 on christarazi:pr/christarazi/fix-deadlock-eni into 82fafa7 on cilium:master.

@christarazi
Copy link
Copy Markdown
Member Author

retest-4.9

@christarazi christarazi added needs-backport/1.8 ready-to-merge This PR has passed all tests and received consensus from code owners to merge. labels Jun 2, 2020
@christarazi
Copy link
Copy Markdown
Member Author

This looks like it's ready to merge.

@borkmann borkmann merged commit e7701f5 into cilium:master Jun 2, 2020
@christarazi christarazi deleted the pr/christarazi/fix-deadlock-eni branch June 2, 2020 23:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/eni Impacts ENI based IPAM. kind/bug This is a bug in the Cilium logic. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/bug This PR fixes an issue in a previous release of Cilium.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

potential deadlock in pkg/eni

5 participants