MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-12 15:32:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

fs: fix logging by not logging common scenarios (#5882)

Browse Source 
Fixes #5881
This commit is contained in:
Harshavardhana 2018-05-02 19:59:38 -07:00 committed by Nitish Tiwari
parent d6df9b16ac
commit d69ba7d085
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
cmd/fs-v1-helpers.go
View File

@ -42,14 +42,13 @@ func fsRemoveFile(ctx context.Context, filePath string) (err error) {
} }
if err = os.Remove((filePath)); err != nil { if err = os.Remove((filePath)); err != nil {
fsErr := osErrToFSFileErr(err) err = osErrToFSFileErr(err)
if fsErr != errFileNotFound { if err != errFileNotFound {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
} }
return fsErr
} }
return nil return err
} }
// Removes all files and folders at a given path, handles // Removes all files and folders at a given path, handles
@ -95,10 +94,8 @@ func fsRemoveDir(ctx context.Context, dirPath string) (err error) {
if err = os.Remove((dirPath)); err != nil { if err = os.Remove((dirPath)); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
logger.LogIf(ctx, errVolumeNotFound)
return errVolumeNotFound return errVolumeNotFound
} else if isSysErrNotEmpty(err) { } else if isSysErrNotEmpty(err) {
logger.LogIf(ctx, errVolumeNotEmpty)
return errVolumeNotEmpty return errVolumeNotEmpty
} }
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
@ -125,7 +122,6 @@ func fsMkdir(ctx context.Context, dirPath string) (err error) {
if err = os.Mkdir((dirPath), 0777); err != nil { if err = os.Mkdir((dirPath), 0777); err != nil {
if os.IsExist(err) { if os.IsExist(err) {
logger.LogIf(ctx, errVolumeExists)
return errVolumeExists return errVolumeExists
} else if os.IsPermission(err) { } else if os.IsPermission(err) {
logger.LogIf(ctx, errDiskAccessDenied) logger.LogIf(ctx, errDiskAccessDenied)
@ -161,11 +157,8 @@ func fsStat(ctx context.Context, statLoc string) (os.FileInfo, error) {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return nil, err return nil, err
} }
fi, err := os.Stat((statLoc)) fi, err := os.Stat(statLoc)
if err != nil { if err != nil {
if err != errFileNotFound {
logger.LogIf(ctx, err)
}
return nil, err return nil, err
} }
@ -219,9 +212,14 @@ func osErrToFSFileErr(err error) error {
func fsStatDir(ctx context.Context, statDir string) (os.FileInfo, error) { func fsStatDir(ctx context.Context, statDir string) (os.FileInfo, error) {
fi, err := fsStat(ctx, statDir) fi, err := fsStat(ctx, statDir)
if err != nil { if err != nil {
return nil, osErrToFSFileErr(err) err = osErrToFSFileErr(err)
if err != errFileNotFound {
logger.LogIf(ctx, err)
}
return nil, err
} }
if !fi.IsDir() { if !fi.IsDir() {
logger.LogIf(ctx, errFileAccessDenied)
return nil, errFileAccessDenied return nil, errFileAccessDenied
} }
return fi, nil return fi, nil
@ -231,7 +229,11 @@ func fsStatDir(ctx context.Context, statDir string) (os.FileInfo, error) {
func fsStatFile(ctx context.Context, statFile string) (os.FileInfo, error) { func fsStatFile(ctx context.Context, statFile string) (os.FileInfo, error) {
fi, err := fsStat(ctx, statFile) fi, err := fsStat(ctx, statFile)
if err != nil { if err != nil {
return nil, osErrToFSFileErr(err) err = osErrToFSFileErr(err)
if err != errFileNotFound {
logger.LogIf(ctx, err)
}
return nil, err
} }
if fi.IsDir() { if fi.IsDir() {
logger.LogIf(ctx, errFileAccessDenied) logger.LogIf(ctx, errFileAccessDenied)
@ -252,15 +254,18 @@ func fsOpenFile(ctx context.Context, readPath string, offset int64) (io.ReadClos
return nil, 0, err return nil, 0, err
} }
fr, err := os.Open((readPath)) fr, err := os.Open(readPath)
if err != nil { if err != nil {
return nil, 0, osErrToFSFileErr(err) return nil, 0, osErrToFSFileErr(err)
} }
// Stat to get the size of the file at path. // Stat to get the size of the file at path.
st, err := os.Stat((readPath)) st, err := os.Stat(readPath)
if err != nil { if err != nil {
err = osErrToFSFileErr(err)
if err != errFileNotFound {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
}
return nil, 0, err return nil, 0, err
} }

7
cmd/fs-v1-rwpool.go
View File

@ -168,12 +168,7 @@ func (fsi *fsIOPool) Create(path string) (wlk *lock.LockedFile, err error) {
} }
// Creates parent if missing. // Creates parent if missing.
if err = os.MkdirAll(pathutil.Dir(path), 0777); err != nil { if err = mkdirAll(pathutil.Dir(path), 0777); err != nil {
if os.IsPermission(err) {
return nil, errFileAccessDenied
} else if isSysErrNotDir(err) {
return nil, errFileAccessDenied
}
return nil, err return nil, err
} }