Merge pull request #3329 from wojtek-t/fix_slo_monitor

k8s-ci-robot · web-flow · commit 2e3eb753def1 · 2025-05-05T00:19:57.000-07:00
Adjust slo_monitor for recent client-go changes
diff --git a/slo-monitor/src/monitors/store.go b/slo-monitor/src/monitors/store.go
@@ -172,13 +172,6 @@ func (q *NoStoreQueue) Pop(process cache.PopProcessFunc) (interface{}, error) {
 		}
 	}()
 	err := process(item, false)
-	if e, ok := err.(cache.ErrRequeue); ok {
-		err = q.AddIfNotPresent(item)
-		if err != nil {
-			glog.Errorf("Error in adding obj: %v", item.obj)
-		}
-		err = e.Err
-	}
 	return item, err
 }
 
diff --git a/slo-monitor/src/monitors/watcher.go b/slo-monitor/src/monitors/watcher.go
@@ -38,7 +38,6 @@ func NewWatcherWithHandler(lw cache.ListerWatcher, objType runtime.Object, setHa
 		ListerWatcher:    lw,
 		ObjectType:       objType,
 		FullResyncPeriod: resyncPeriod,
-		RetryOnError:     false,
 
 		Process: func(obj interface{}, _ bool) error {
 			workItem := obj.(workItem)

Original file line number	Diff line number	Diff line change
`@@ -172,13 +172,6 @@ func (q *NoStoreQueue) Pop(process cache.PopProcessFunc) (interface{}, error) {`
`172`	`172`	`}`
`173`	`173`	`}()`
`174`	`174`	`err := process(item, false)`
`175`		`- if e, ok := err.(cache.ErrRequeue); ok {`
`176`		`- err = q.AddIfNotPresent(item)`
`177`		`- if err != nil {`
`178`		`- glog.Errorf("Error in adding obj: %v", item.obj)`
`179`		`- }`
`180`		`- err = e.Err`
`181`		`- }`
`182`	`175`	`return item, err`
`183`	`176`	`}`
`184`	`177`