pkg/node: fix concurrent access of entry node #14591
Merged
Conversation
This file contains 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
Fixes the following data race:
```
Read at 0x00c00079f200 by goroutine 43:
github.com/cilium/cilium/pkg/node/manager.(*Manager).StartNeighborRefresh.func1.1()
/go/src/github.com/cilium/cilium/pkg/node/manager/manager.go:581 +0xc4
Previous write at 0x00c00079f200 by goroutine 166:
github.com/cilium/cilium/pkg/node/manager.(*Manager).NodeUpdated()
/go/src/github.com/cilium/cilium/pkg/node/manager/manager.go:414 +0x824
github.com/cilium/cilium/pkg/k8s/watchers.(*K8sWatcher).ciliumNodeInit.func2()
/go/src/github.com/cilium/cilium/pkg/k8s/watchers/cilium_node.go:71 +0x2d4
k8s.io/client-go/tools/cache.ResourceEventHandlerFuncs.OnUpdate()
/go/src/github.com/cilium/cilium/vendor/k8s.io/client-go/tools/cache/controller.go:238 +0xa5
k8s.io/client-go/tools/cache.(*ResourceEventHandlerFuncs).OnUpdate()
<autogenerated>:1 +0x2e
github.com/cilium/cilium/pkg/k8s/informer.NewInformerWithStore.func1()
/go/src/github.com/cilium/cilium/pkg/k8s/informer/informer.go:114 +0x389
k8s.io/client-go/tools/cache.(*DeltaFIFO).Pop()
/go/src/github.com/cilium/cilium/vendor/k8s.io/client-go/tools/cache/delta_fifo.go:507 +0x50d
k8s.io/client-go/tools/cache.(*controller).processLoop()
/go/src/github.com/cilium/cilium/vendor/k8s.io/client-go/tools/cache/controller.go:183 +0x83
k8s.io/client-go/tools/cache.(*controller).processLoop-fm()
/go/src/github.com/cilium/cilium/vendor/k8s.io/client-go/tools/cache/controller.go:181 +0x44
k8s.io/apimachinery/pkg/util/wait.BackoffUntil.func1()
/go/src/github.com/cilium/cilium/vendor/k8s.io/apimachinery/pkg/util/wait/wait.go:155 +0x75
k8s.io/apimachinery/pkg/util/wait.BackoffUntil()
/go/src/github.com/cilium/cilium/vendor/k8s.io/apimachinery/pkg/util/wait/wait.go:156 +0xba
k8s.io/apimachinery/pkg/util/wait.JitterUntil()
/go/src/github.com/cilium/cilium/vendor/k8s.io/apimachinery/pkg/util/wait/wait.go:133 +0x114
k8s.io/apimachinery/pkg/util/wait.Until()
/go/src/github.com/cilium/cilium/vendor/k8s.io/apimachinery/pkg/util/wait/wait.go:90 +0x507
k8s.io/client-go/tools/cache.(*controller).Run()
/go/src/github.com/cilium/cilium/vendor/k8s.io/client-go/tools/cache/controller.go:154 +0x4a9
Goroutine 43 (running) created at:
github.com/cilium/cilium/pkg/node/manager.(*Manager).StartNeighborRefresh.func1()
/go/src/github.com/cilium/cilium/pkg/node/manager/manager.go:578 +0x368
github.com/cilium/cilium/pkg/controller.(*Controller).runController()
/go/src/github.com/cilium/cilium/pkg/controller/controller.go:208 +0xd10
Goroutine 166 (running) created at:
github.com/cilium/cilium/pkg/k8s/watchers.(*K8sWatcher).ciliumNodeInit()
/go/src/github.com/cilium/cilium/pkg/k8s/watchers/cilium_node.go:101 +0x184
```
Fixes: 5ec4d51 ("daemon, node: refresh neighbor by sending arping periodically")
Signed-off-by: André Martins <andre@cilium.io>
aanm
added
kind/bug
|
cc @jaffcheng |
|
test-me-please |
gandro
approved these changes
Jan 12, 2021
brb
reviewed
Jan 12, 2021
brb
approved these changes
Jan 12, 2021
|
retest-gke |
|
Hit #14608 , the test is not run in any of the other CI jobs. The test itself is known to fail occasionally but I could not find any evidence of the exact same issue. Re-running CI to see if it is a flake. |
|
retest-gke EDIT: Node allocation seemed to fail. |
|
retest-gke |
maintainer-s-little-helper
bot
added
the
ready-to-merge
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.9
in 1.9.2
maintainer-s-little-helper
bot
moved this from Backport pending to v1.9
to Backport done to v1.9
in 1.9.2
This was referenced Jan 19, 2021
maintainer-s-little-helper
bot
moved this from Needs backport from master
to Backport pending to v1.8
in 1.8.7
maintainer-s-little-helper
bot
moved this from Backport pending to v1.8
to Backport done to v1.8
in 1.8.7
maintainer-s-little-helper
bot
moved this from Backport pending to v1.8
to Backport done to v1.8
in 1.8.7
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.
Fixes the following data race:
Fixes: 5ec4d51 ("daemon, node: refresh neighbor by sending arping periodically")
Signed-off-by: André Martins andre@cilium.io