github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #30839 from lavalamp/fix

Browse Source 
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.
This commit is contained in:
Kubernetes Submit Queue 2016-08-18 02:43:25 -07:00 committed by GitHub
commit 86340fc123
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/client/cache/delta_fifo.go vendored
View File

@ -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 {