Skip to content

K
k3s
Commit 86340fc1 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #30839 from lavalamp/fix

Automatic merge from submit-queue queueActionLocked requires write lock Fix https://github.com/kubernetes/minikube/issues/368 Fix part of #30759 Hopefully. On stack dumps I couldn't see who was fighting with this.
parents e2f39fca 3e69c5a9
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/client/cache/delta_fifo.go
View file @ 86340fc1
...@@ -496,8 +496,8 @@ func (f *DeltaFIFO) Replace(list []interface{}, resourceVersion string) error { ...@@ -496,8 +496,8 @@ func (f *DeltaFIFO) Replace(list []interface{}, resourceVersion string) error {
// Resync will send a sync event for each item // Resync will send a sync event for each item
func (f *DeltaFIFO) Resync() error { func (f *DeltaFIFO) Resync() error {
f.lock.RLock() f.lock.Lock()
defer f.lock.RUnlock() defer f.lock.Unlock()
for _, k := range f.knownObjects.ListKeys() { for _, k := range f.knownObjects.ListKeys() {
obj, exists, err := f.knownObjects.GetByKey(k) obj, exists, err := f.knownObjects.GetByKey(k)
if err != nil { if err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment