KurlesHS/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Merge pull request #4175 from fergus-dall/deadlock-fix

Browse source 
Fix deadlock in Lock.Stale
This commit is contained in:
Michael Eischer 2023-01-26 22:45:13 +01:00 committed by GitHub
commit 49fa8fe6dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/restic/lock.go
View file

@ -222,7 +222,7 @@ var StaleLockTimeout = 30 * time.Minute
func (l *Lock) Stale() bool { func (l *Lock) Stale() bool {
l.lock.Lock() l.lock.Lock()
defer l.lock.Unlock() defer l.lock.Unlock()
debug.Log("testing if lock %v for process %d is stale", l, l.PID) debug.Log("testing if lock %v for process %d is stale", l.lockID, l.PID)
if time.Since(l.Time) > StaleLockTimeout { if time.Since(l.Time) > StaleLockTimeout {
debug.Log("lock is stale, timestamp is too old: %v\n", l.Time) debug.Log("lock is stale, timestamp is too old: %v\n", l.Time)
return true return true