Skip to content

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

Merge pull request #40815 from ncdc/delta-fifo-atomic-resync

Automatic merge from submit-queue (batch tested with PRs 40873, 40948, 39580, 41065, 40815) Make DeltaFIFO Resync atomic Make DeltaFIFO's Resync operation atomic, so it enqueues the entire queue before allowing adds/updates/deletes. I'm hoping to use this to help with custom resync periods for multiple event handlers against a single shared informer (see https://github.com/kubernetes/kubernetes/pull/40759#pullrequestreview-19598213 for the motivation). @lavalamp @smarterclayton @deads2k @liggitt @sttts @timothysc @wojtek-t @gmarek @kubernetes/sig-api-machinery-pr-reviews @kubernetes/sig-scalability-pr-reviews
parents e280e27f d8205df1
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 7 deletions
staging/src/k8s.io/client-go/tools/cache/delta_fifo.go
View file @ bd17091e
...@@ -505,14 +505,12 @@ func (f *DeltaFIFO) Replace(list []interface{}, resourceVersion string) error { ...@@ -505,14 +505,12 @@ 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 {
var keys []string f.lock.Lock()
func() { defer f.lock.Unlock()
f.lock.RLock()
defer f.lock.RUnlock() keys := f.knownObjects.ListKeys()
keys = f.knownObjects.ListKeys()
}()
for _, k := range keys { for _, k := range keys {
if err := f.syncKey(k); err != nil { if err := f.syncKeyLocked(k); err != nil {
return err return err
} }
} }
...@@ -522,6 +520,11 @@ func (f *DeltaFIFO) Resync() error { ...@@ -522,6 +520,11 @@ func (f *DeltaFIFO) Resync() error {
func (f *DeltaFIFO) syncKey(key string) error { func (f *DeltaFIFO) syncKey(key string) error {
f.lock.Lock() f.lock.Lock()
defer f.lock.Unlock() defer f.lock.Unlock()
return f.syncKeyLocked(key)
}
func (f *DeltaFIFO) syncKeyLocked(key string) error {
obj, exists, err := f.knownObjects.GetByKey(key) obj, exists, err := f.knownObjects.GetByKey(key)
if err != nil { if err != nil {
glog.Errorf("Unexpected error %v during lookup of key %v, unable to queue object for sync", err, key) glog.Errorf("Unexpected error %v during lookup of key %v, unable to queue object for sync", err, key)
......
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