Fix windows lock race: Lock exclusive after all try lock errors #2800
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We don't know what kind of error the OS gives us on `try_lock_exclusive` with an already locked file, so we assume all those errors are an already locked file and call `lock_exclusive`.
For example the windows error:
```
Os {
code: 33,
kind: Uncategorized,
message: "The process cannot access the file because another process has locked a portion of the file.",
}
```
Fixes #2767
Closed
zanieb
reviewed
Apr 3, 2024
| warn_user!( | ||
| "Waiting to acquire lock for {} (lockfile: {})", | ||
| resource, | ||
| path.user_display(), | ||
| ); | ||
| file.file().lock_exclusive()?; | ||
| file.file().lock_exclusive().map_err(|err| { | ||
| // Not an fs_err method, we need to build our own path context |
There was a problem hiding this comment.
@konstin can you open an upstream issue to add?
There was a problem hiding this comment.
I don't think that's in scope for either project
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We don't know what kind of error the OS gives us on
try_lock_exclusivewith an already locked file, so we assume all those errors are an already locked file and calllock_exclusive.For example the windows error:
Fixes #2767