dumb deadlock play

grokspawn · grokspawn · commit c86a2ef63b0b · 2025-06-30T13:52:07.000-05:00
Signed-off-by: grokspawn &lt;jordan@nimblewidget.com&gt;
diff --git a/pkg/controller/registry/resolver/cache/cache.go b/pkg/controller/registry/resolver/cache/cache.go
@@ -336,12 +336,12 @@ func (hdr *snapshotHeader) Valid() bool {
 }
 
 func (hdr *snapshotHeader) RequestSentinelActive() bool {
+	hdr.m.RLock()
+	defer hdr.m.RUnlock()
 	if hdr == nil {
 		return false
 	}
 
-	hdr.m.RLock()
-	defer hdr.m.RUnlock()
 	return time.Now().Before(hdr.requestSentinel)
 }
 

Original file line number	Diff line number	Diff line change
`@@ -336,12 +336,12 @@ func (hdr *snapshotHeader) Valid() bool {`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`func (hdr *snapshotHeader) RequestSentinelActive() bool {`
	`339`	`+ hdr.m.RLock()`
	`340`	`+ defer hdr.m.RUnlock()`
`339`	`341`	`if hdr == nil {`
`340`	`342`	`return false`
`341`	`343`	`}`
`342`	`344`
`343`		`- hdr.m.RLock()`
`344`		`- defer hdr.m.RUnlock()`
`345`	`345`	`return time.Now().Before(hdr.requestSentinel)`
`346`	`346`	`}`
`347`	`347`