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

envoy: Take xds mutator lock for map access #11541

Merged
merged 1 commit into from May 15, 2020

Conversation

jrajahalme
Copy link
Member

'ackedVersions' was accessed in DeleteNode() without taking the mutex
which can lead to mutating the map while readers are accessing it.

Fixes: #11535
Signed-off-by: Jarno Rajahalme jarno@covalent.io

'ackedVersions' was accessed in DeleteNode() without taking the mutex
which can lead to mutating the map while readers are accessing it.

Fixes: #11535
Signed-off-by: Jarno Rajahalme <jarno@covalent.io>
@jrajahalme jrajahalme added kind/bug This is a bug in the Cilium logic. priority/release-blocker area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. release-note/bug This PR fixes an issue in a previous release of Cilium. labels May 15, 2020
@jrajahalme jrajahalme requested a review from a team as a code owner May 15, 2020 08:33
@maintainer-s-little-helper maintainer-s-little-helper bot added this to In progress in 1.8.0 May 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.6.9 May 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.7.4 May 15, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot added this to Needs backport from master in 1.5.14 May 15, 2020
@jrajahalme
Copy link
Member Author

test-me-please

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.002%) to 37.009% when pulling c72a77d on pr/jrajahalme/envoy-xds-ack-lock-fix into 182b5a6 on master.

@aanm aanm added this to Needs backport from master in 1.7.5 May 15, 2020
@jrajahalme
Copy link
Member Author

jrajahalme commented May 15, 2020

k8s 1.17 hit by #11313

@jrajahalme
Copy link
Member Author

Runtime hit by #11512

@jrajahalme
Copy link
Member Author

test-me-please

@aanm
Copy link
Member

aanm commented May 15, 2020

@jrajahalme there's no need to re-run the tests if they hit known flakes.

@aanm aanm merged commit 003efe4 into master May 15, 2020
1.8.0 automation moved this from In progress to Merged May 15, 2020
@aanm aanm deleted the pr/jrajahalme/envoy-xds-ack-lock-fix branch May 15, 2020 19:49
@tklauser tklauser moved this from Needs backport from master to Backport pending to v1.7 in 1.7.5 Jun 3, 2020
@joestringer joestringer moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.5 Jun 3, 2020
@joestringer joestringer moved this from Backport done to v1.7 to Backport pending to v1.7 in 1.7.5 Jun 3, 2020
@joestringer joestringer moved this from Backport pending to v1.7 to Backport done to v1.7 in 1.7.5 Jun 3, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.6 in 1.6.9 Jun 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Needs backport from master to Backport pending to v1.6 in 1.6.9 Jun 4, 2020
@maintainer-s-little-helper maintainer-s-little-helper bot moved this from Backport pending to v1.6 to Backport done to v1.6 in 1.6.9 Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/proxy Impacts proxy components, including DNS, Kafka, Envoy and/or XDS servers. kind/bug This is a bug in the Cilium logic. release-note/bug This PR fixes an issue in a previous release of Cilium.
Projects
No open projects
1.5.14
Needs backport from master
1.6.9
Backport done to v1.6
1.7.4
Needs backport from master
1.7.5
Backport done to v1.7
1.8.0
  
Merged
Development

Successfully merging this pull request may close these issues.

pkg/envoy/xds: fatal error: concurrent map read and map write
4 participants