MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-23 02:21:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

for O_RDONLY mode hold shared locks on windows (#6454)

Browse Source 
Fixes #6401
This commit is contained in:
Harshavardhana 2018-09-12 09:29:41 -07:00 committed by kannappanr
parent 166e998788
commit 0c2b708484
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/lock/lock_windows.go
View File

@ -76,13 +76,25 @@ func lockedOpenFile(path string, flag int, perm os.FileMode, lockType uint32) (*
// doesn't wait forever but instead returns if it cannot // doesn't wait forever but instead returns if it cannot
// acquire a write lock. // acquire a write lock.
func TryLockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error) { func TryLockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error) {
return lockedOpenFile(path, flag, perm, lockFileFailImmediately) var lockType uint32 = lockFileFailImmediately | lockFileExclusiveLock
switch flag {
case syscall.O_RDONLY:
// https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-lockfileex
lockType = lockFileFailImmediately | 0 // Set this to enable shared lock and fail immediately.
}
return lockedOpenFile(path, flag, perm, lockType)
} }
// LockedOpenFile - initializes a new lock and protects // LockedOpenFile - initializes a new lock and protects
// the file from concurrent access. // the file from concurrent access.
func LockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error) { func LockedOpenFile(path string, flag int, perm os.FileMode) (*LockedFile, error) {
return lockedOpenFile(path, flag, perm, 0) var lockType uint32 = lockFileExclusiveLock
switch flag {
case syscall.O_RDONLY:
// https://docs.microsoft.com/en-us/windows/desktop/api/fileapi/nf-fileapi-lockfileex
lockType = 0 // Set this to enable shared lock.
}
return lockedOpenFile(path, flag, perm, lockType)
} }
// fixLongPath returns the extended-length (\\?\-prefixed) form of // fixLongPath returns the extended-length (\\?\-prefixed) form of
@ -165,7 +177,7 @@ func fixLongPath(path string) string {
return string(pathbuf[:w]) return string(pathbuf[:w])
} }
// perm param is ignored, on windows file perms/NT acls // Open - perm param is ignored, on windows file perms/NT acls
// are not octet combinations. Providing access to NT // are not octet combinations. Providing access to NT
// acls is out of scope here. // acls is out of scope here.
func Open(path string, flag int, perm os.FileMode) (*os.File, error) { func Open(path string, flag int, perm os.FileMode) (*os.File, error) {
@ -217,14 +229,11 @@ func Open(path string, flag int, perm os.FileMode) (*os.File, error) {
func lockFile(fd syscall.Handle, flags uint32) error { func lockFile(fd syscall.Handle, flags uint32) error {
// https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203(v=vs.85).aspx // https://msdn.microsoft.com/en-us/library/windows/desktop/aa365203(v=vs.85).aspx
var flag uint32 = lockFileExclusiveLock // Lockfile exlusive.
flag |= flags
if fd == syscall.InvalidHandle { if fd == syscall.InvalidHandle {
return nil return nil
} }
err := lockFileEx(fd, flag, 1, 0, &syscall.Overlapped{}) err := lockFileEx(fd, flags, 1, 0, &syscall.Overlapped{})
if err == nil { if err == nil {
return nil return nil
} else if err.Error() == "The process cannot access the file because another process has locked a portion of the file." { } else if err.Error() == "The process cannot access the file because another process has locked a portion of the file." {