Skip to content
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

[tests-only] Fix flocks by ignoring not found errors #2851

Merged
merged 2 commits into from
May 10, 2022
Merged

[tests-only] Fix flocks by ignoring not found errors #2851

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
892c2b2
ignore not found error on remove operation
kobergj May 10, 2022
a8f94e6
Merge branch 'edge' into FixFlocksByIgnoring
kobergj May 10, 2022
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
9 changes: 8 additions & 1 deletion pkg/storage/utils/filelocks/filelocks.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package filelocks

import (
"errors"
"io/fs"
"os"
"sync"
"time"
Expand Down Expand Up @@ -140,8 +141,14 @@ func ReleaseLock(lock *flock.Flock) error {

err = lock.Unlock()
if err == nil {
if !lock.Locked() {
if !lock.Locked() && !lock.RLocked() {
err = os.Remove(n)
// there is a concurrency issue when deleting the file
// see https://github.com/owncloud/ocis/issues/3757
// for now we just ignore "not found" errors when they pop up
if err != nil && errors.Is(err, fs.ErrNotExist) {
err = nil
}
}
}
releaseMutexedFlock(n)
Expand Down