MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 06:05:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

update fsSimpleRenameFile contrib

Browse Source
This commit is contained in:
Harshavardhana 2021-05-08 22:31:41 -07:00
parent 764721e2c6
commit 39d681a04a
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,9 +320,9 @@ func fsCreateFile(ctx context.Context, filePath string, reader io.Reader, falloc
return bytesWritten, nil
}
// Renames source path to destination path, fails if the destination path
// parents are not already created.
func fsSimpleRenameFile(ctx context.Context, sourcePath, destPath string) error {
// Renames source path to destination path, creates all the
// missing parents if they don't exist.
func fsRenameFile(ctx context.Context, sourcePath, destPath string) error {
if err := checkPathLength(sourcePath); err != nil {
logger.LogIf(ctx, err)
return err
@ -332,9 +332,9 @@ func fsSimpleRenameFile(ctx context.Context, sourcePath, destPath string) error
return err
}
if err := os.Rename(sourcePath, destPath); err != nil {
if err := renameAll(sourcePath, destPath); err != nil {
logger.LogIf(ctx, err)
return osErrToFileErr(err)
return err
}
return nil

11
cmd/fs-v1-helpers_contrib.go
View File

@ -18,13 +18,14 @@ package cmd
import (
"context"
"os"
"github.com/minio/minio/cmd/logger"
)
// Renames source path to destination path, creates all the
// missing parents if they don't exist.
func fsRenameFile(ctx context.Context, sourcePath, destPath string) error {
// Renames source path to destination path, fails if the destination path
// parents are not already created.
func fsSimpleRenameFile(ctx context.Context, sourcePath, destPath string) error {
if err := checkPathLength(sourcePath); err != nil {
logger.LogIf(ctx, err)
return err
@ -34,9 +35,9 @@ func fsRenameFile(ctx context.Context, sourcePath, destPath string) error {
return err
}
if err := renameAll(sourcePath, destPath); err != nil {
if err := os.Rename(sourcePath, destPath); err != nil {
logger.LogIf(ctx, err)
return err
return osErrToFileErr(err)
}
return nil