Merge pull request #19443 from k8s-infra-cherrypick-robot/cherry-pick-19432-to-release-3.6

ahrtr · web-flow · commit ddfc34f7ee37 · 2025-02-25T07:58:24.000Z
[release-3.6] Use RLock in Demoted method for read-only access to expiry
diff --git a/server/lease/lease.go b/server/lease/lease.go
@@ -97,8 +97,8 @@ func (l *Lease) forever() {
 
 // Demoted returns true if the lease's expiry has been reset to forever.
 func (l *Lease) Demoted() bool {
-	l.expiryMu.Lock()
-	defer l.expiryMu.Unlock()
+	l.expiryMu.RLock()
+	defer l.expiryMu.RUnlock()
 	return l.expiry == forever
 }
 

Original file line number	Diff line number	Diff line change
`@@ -97,8 +97,8 @@ func (l *Lease) forever() {`
`97`	`97`
`98`	`98`	`// Demoted returns true if the lease's expiry has been reset to forever.`
`99`	`99`	`func (l *Lease) Demoted() bool {`
`100`		`- l.expiryMu.Lock()`
`101`		`- defer l.expiryMu.Unlock()`
	`100`	`+ l.expiryMu.RLock()`
	`101`	`+ defer l.expiryMu.RUnlock()`
`102`	`102`	`return l.expiry == forever`
`103`	`103`	`}`
`104`	`104`