Merge pull request kubernetes#30839 from lavalamp/fix

Automatic merge from submit-queue queueActionLocked requires write lock Fix kubernetes/minikube#368 Fix part of kubernetes#30759 Hopefully. On stack dumps I couldn't see who was fighting with this.
lavalamp · Aug 18, 2016 · 86340fc · 86340fc
2 parents e2f39fc + 3e69c5a
commit 86340fc
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/client/cache/delta_fifo.go b/pkg/client/cache/delta_fifo.go
@@ -496,8 +496,8 @@ func (f *DeltaFIFO) Replace(list []interface{}, resourceVersion string) error {
 
 // Resync will send a sync event for each item
 func (f *DeltaFIFO) Resync() error {
-	f.lock.RLock()
-	defer f.lock.RUnlock()
+	f.lock.Lock()
+	defer f.lock.Unlock()
 	for _, k := range f.knownObjects.ListKeys() {
 		obj, exists, err := f.knownObjects.GetByKey(k)
 		if err != nil {