gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix stale admin lock metric when lock expires and is reacquired (#8859)

Browse Source 
* Fix stale admin lock metric when lock expires and is reacquired (#8857)

When a lock expired without an explicit unlock and a different client
acquired it, the old client's metric was never cleared, causing
multiple clients to appear as simultaneously holding the lock.

* Use DeleteLabelValues instead of Set(0) to remove stale metric series

Avoids cardinality explosion from accumulated stale series when
client names are dynamic.
This commit is contained in:
Chris Lu
2026-03-30 18:51:38 -07:00
committed by GitHub
parent ced2236cc6
commit 4705d8b82b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/server/master_grpc_server_admin.go
View File

@@ -106,6 +106,9 @@ func (locks *AdminLocks) isValidToken(lockName string, ts time.Time, token int64
func (locks *AdminLocks) generateToken(lockName string, clientName string) (ts time.Time, token int64) { func (locks *AdminLocks) generateToken(lockName string, clientName string) (ts time.Time, token int64) {
locks.Lock() locks.Lock()
defer locks.Unlock() defer locks.Unlock()
if existing, found := locks.locks[lockName]; found && existing.lastClient != clientName {
stats.MasterAdminLock.DeleteLabelValues(existing.lastClient)
}
lock := &AdminLock{ lock := &AdminLock{
accessSecret: rand.Int64(), accessSecret: rand.Int64(),
accessLockTime: time.Now(), accessLockTime: time.Now(),
@@ -118,7 +121,7 @@ func (locks *AdminLocks) generateToken(lockName string, clientName string) (ts t
func (locks *AdminLocks) deleteLock(lockName string) { func (locks *AdminLocks) deleteLock(lockName string) {
locks.Lock() locks.Lock()
stats.MasterAdminLock.WithLabelValues(locks.locks[lockName].lastClient).Set(0) stats.MasterAdminLock.DeleteLabelValues(locks.locks[lockName].lastClient)
defer locks.Unlock() defer locks.Unlock()
delete(locks.locks, lockName) delete(locks.locks, lockName)
} }