fix: open with RDWR for exclusive file lock #3780
Merged
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
dnwe
requested review from
awly,
fspmarshall,
klizhentas,
russjones and
webvictim
as code owners
|
ok to test |
|
Can one of the admins verify this patch? |
|
ok to test |
|
dnwe
force-pushed
the
use-rdwr-for-exclusive-lock
branch
from
f042602 to
8b90e13
Compare
fspmarshall
approved these changes
May 28, 2020
lib/events/uploader.go
Outdated
| @@ -219,7 +219,7 @@ func (u *Uploader) emitEvent(e UploadEvent) { | |||
| } | |||
|
|
|||
| func (u *Uploader) uploadFile(lockFilePath string, sessionID session.ID) error { | |||
| lockFile, err := os.Open(lockFilePath) | |||
| lockFile, err := os.OpenFile(lockFilePath, os.O_RDWR, 0640) | |||
There was a problem hiding this comment.
Nit: Cleaner to just pass 0 for permission bits since we aren't using O_CREATE (teleport is full of unused permission bits being passed to OpenFile, so fixing this really isn't necessary).
There was a problem hiding this comment.
@fspmarshall good point, fixed 👍
In order to place an exclusive lock on NFS storage, the file must be opened for writing. Fixes gravitational#3779 Signed-off-by: Dominic Evans <[email protected]>
dnwe
force-pushed
the
use-rdwr-for-exclusive-lock
branch
from
8b90e13 to
af4d437
Compare
russjones
approved these changes
May 29, 2020
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.
In order to place an exclusive lock on NFS storage, the file must be
opened for writing.
Fixes #3779
Signed-off-by: Dominic Evans [email protected]