self-hosted/minio
self-hosted/minio
1
0
Fork 0
mirror of https://github.com/minio/minio synced 2024-09-15 22:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

posix: ReadAll should handle the case when parent is not a dir. (#2163)

Browse source 
It can happen so that a read request can come for a file which
already has a parent i.e a file.

This fix handles this scenario - fixes #2047
This commit is contained in:
Harshavardhana 2016-07-11 00:15:37 -07:00 committed by Anand Babu (AB) Periasamy
parent d676e660c9
commit de468f92ec
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
posix.go
View file

@ -424,11 +424,14 @@ func (s *posix) ReadAll(volume, path string) (buf []byte, err error) {
} else if os.IsPermission(err) {
return nil, errFileAccessDenied
} else if pathErr, ok := err.(*os.PathError); ok {
if pathErr.Err == syscall.EISDIR {
return nil, errFileNotFound
} else if strings.Contains(pathErr.Err.Error(), "The handle is invalid") {
// This case is special and needs to be handled for windows.
switch pathErr.Err {
case syscall.ENOTDIR, syscall.EISDIR:
return nil, errFileNotFound
default:
if strings.Contains(pathErr.Err.Error(), "The handle is invalid") {
// This case is special and needs to be handled for windows.
return nil, errFileNotFound
}
}
return nil, pathErr
}

11
posix_test.go
View file

@ -73,6 +73,9 @@ func TestReadAll(t *testing.T) {
if err = posix.AppendFile("exists", "as-file", []byte("Hello, World")); err != nil {
t.Fatalf("Unable to create a file \"as-file\", %s", err)
}
if err = posix.AppendFile("exists", "as-file-parent", []byte("Hello, World")); err != nil {
t.Fatalf("Unable to create a file \"as-file-parent\", %s", err)
}
// Testcases to validate different conditions for ReadAll API.
testCases := []struct {
@ -99,8 +102,12 @@ func TestReadAll(t *testing.T) {
"as-directory",
errFileNotFound,
},
// Validate the good condition file exists and we are able to
// read it.
{
"exists",
"as-file-parent/as-file",
errFileNotFound,
},
// Validate the good condition file exists and we are able to read it.
{
"exists",
"as-file",

1
xl-v1-metadata.go
View file

@ -203,6 +203,7 @@ var objMetadataOpIgnoredErrs = []error{
errDiskAccessDenied,
errFaultyDisk,
errVolumeNotFound,
errFileAccessDenied,
}
// readXLMetadata - returns the object metadata `xl.json` content from