Skip to content

Commit 62365d7

Browse files
committed
avoiding refactor, delay err storm by request ttl
1 parent 17b0b50 commit 62365d7

File tree

2 files changed

+14
-4
lines changed
  • staging/operator-lifecycle-manager/pkg/controller/registry/resolver/cache
  • vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache

2 files changed

+14
-4
lines changed

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/cache/cache.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ func (c *Cache) Namespaced(namespaces ...string) MultiCatalogOperatorFinder {
170170
if snapshot.Valid() {
171171
result.snapshots[key] = snapshot
172172
} else {
173-
misses = append(misses, key)
173+
if !snapshot.RequestSentinelActive() {
174+
misses = append(misses, key)
175+
}
174176
}
175177
}()
176178
}
@@ -336,7 +338,10 @@ func (hdr *snapshotHeader) Valid() bool {
336338
func (hdr *snapshotHeader) RequestSentinelActive() bool {
337339
hdr.m.RLock()
338340
defer hdr.m.RUnlock()
339-
return time.Now().Before(hdr.requestSentinel)
341+
if hdr != nil && time.Now().Before(hdr.requestSentinel) {
342+
return true
343+
}
344+
return false
340345
}
341346

342347
type sortableSnapshots struct {

vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry/resolver/cache/cache.go

Lines changed: 7 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)