Skip to content

Reset lock retry count if lock file timestamp changes #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 16, 2019
Merged

Reset lock retry count if lock file timestamp changes #290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions store/json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,10 @@ func (kvs *jsonFileStore) Lock(block bool) error {
lockPerm := os.FileMode(0664) + os.FileMode(os.ModeExclusive)

// Try to acquire the lock file.
for i := 0; ; i++ {
var lockRetryCount uint
var modTimeCur time.Time
var modTimePrev time.Time
for lockRetryCount < lockMaxRetries {
lockFile, err = os.OpenFile(lockName, os.O_CREATE|os.O_EXCL|os.O_RDWR, lockPerm)
if err == nil {
break
Expand All @@ -151,12 +154,24 @@ func (kvs *jsonFileStore) Lock(block bool) error {
return ErrNonBlockingLockIsAlreadyLocked
}

if i == lockMaxRetries {
return ErrTimeoutLockingStore
// Reset the lock retry count if the timestamp for the lock file changes.
if fileInfo, err := os.Stat(lockName); err == nil {
modTimeCur = fileInfo.ModTime()
if !modTimeCur.Equal(modTimePrev) {
lockRetryCount = 0
}
modTimePrev = modTimeCur
}

time.Sleep(lockRetryDelay)

lockRetryCount++
}

if lockRetryCount == lockMaxRetries {
return ErrTimeoutLockingStore
}

defer lockFile.Close()

// Write the process ID for easy identification.
Expand Down