astelm/minio
1
0
Fork 0
mirror of https://github.com/pgsty/minio.git synced 2026-10-08 18:55:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: unwrapping issues with os.Is* functions (#10949)

Browse Source 
reduces  3 stat calls, reducing the
overall startup time significantly.
This commit is contained in:
Harshavardhana
2020-11-23 08:36:49 -08:00
committed by GitHub
parent 39f3d5493b
commit df93102235
22 changed files with 158 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/fs-v1-helpers.go
+8 -8
View File
@@ -64,7 +64,7 @@ func fsRemoveAll(ctx context.Context, dirPath string) (err error) {
}
if err = removeAll(dirPath); err != nil {
if os.IsPermission(err) {
if osIsPermission(err) {
logger.LogIf(ctx, errVolumeAccessDenied)
return errVolumeAccessDenied
} else if isSysErrNotEmpty(err) {
@@ -92,7 +92,7 @@ func fsRemoveDir(ctx context.Context, dirPath string) (err error) {
}
if err = os.Remove((dirPath)); err != nil {
if os.IsNotExist(err) {
if osIsNotExist(err) {
return errVolumeNotFound
} else if isSysErrNotEmpty(err) {
return errVolumeNotEmpty
@@ -121,9 +121,9 @@ func fsMkdir(ctx context.Context, dirPath string) (err error) {
if err = os.Mkdir((dirPath), 0777); err != nil {
switch {
case os.IsExist(err):
case osIsExist(err):
return errVolumeExists
case os.IsPermission(err):
case osIsPermission(err):
logger.LogIf(ctx, errDiskAccessDenied)
return errDiskAccessDenied
case isSysErrNotDir(err):
@@ -170,9 +170,9 @@ func fsStat(ctx context.Context, statLoc string) (os.FileInfo, error) {
func fsStatVolume(ctx context.Context, volume string) (os.FileInfo, error) {
fi, err := fsStat(ctx, volume)
if err != nil {
if os.IsNotExist(err) {
if osIsNotExist(err) {
return nil, errVolumeNotFound
} else if os.IsPermission(err) {
} else if osIsPermission(err) {
return nil, errVolumeAccessDenied
}
return nil, err
@@ -285,9 +285,9 @@ func fsCreateFile(ctx context.Context, filePath string, reader io.Reader, buf []
if err := mkdirAll(pathutil.Dir(filePath), 0777); err != nil {
switch {
case os.IsPermission(err):
case osIsPermission(err):
return 0, errFileAccessDenied
case os.IsExist(err):
case osIsExist(err):
return 0, errFileAccessDenied
case isSysErrIO(err):
return 0, errFaultyDisk