From eecad6062a614fbd1cd90f9dbf023479a30b675c Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Wed, 25 Dec 2019 09:56:42 -0800 Subject: [PATCH] go fmt --- weed/shell/command_volume_tier_download.go | 8 ++++---- weed/storage/backend/s3_backend/s3_download.go | 2 +- weed/storage/backend/s3_backend/s3_sessions.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/weed/shell/command_volume_tier_download.go b/weed/shell/command_volume_tier_download.go index 3921f1449..88e2e8b92 100644 --- a/weed/shell/command_volume_tier_download.go +++ b/weed/shell/command_volume_tier_download.go @@ -109,8 +109,8 @@ func doVolumeTierDownload(ctx context.Context, commandEnv *CommandEnv, writer io // copy the .dat file from remote tier to local err = downloadDatFromRemoteTier(ctx, commandEnv.option.GrpcDialOption, writer, needle.VolumeId(vid), collection, loc.Url) if err != nil { - return fmt.Errorf("download dat file for volume %d to %s: %v", vid, loc.Url, err) - } + return fmt.Errorf("download dat file for volume %d to %s: %v", vid, loc.Url, err) + } } return nil @@ -120,8 +120,8 @@ func downloadDatFromRemoteTier(ctx context.Context, grpcDialOption grpc.DialOpti err := operation.WithVolumeServerClient(targetVolumeServer, grpcDialOption, func(volumeServerClient volume_server_pb.VolumeServerClient) error { stream, downloadErr := volumeServerClient.VolumeTierMoveDatFromRemote(ctx, &volume_server_pb.VolumeTierMoveDatFromRemoteRequest{ - VolumeId: uint32(volumeId), - Collection: collection, + VolumeId: uint32(volumeId), + Collection: collection, }) var lastProcessed int64 diff --git a/weed/storage/backend/s3_backend/s3_download.go b/weed/storage/backend/s3_backend/s3_download.go index f319ee691..dbc28446a 100644 --- a/weed/storage/backend/s3_backend/s3_download.go +++ b/weed/storage/backend/s3_backend/s3_download.go @@ -42,7 +42,7 @@ func downloadFromS3(sess s3iface.S3API, destFileName string, sourceBucket string } // Download the file from S3. - fileSize, err = downloader.Download(fileWriter,&s3.GetObjectInput{ + fileSize, err = downloader.Download(fileWriter, &s3.GetObjectInput{ Bucket: aws.String(sourceBucket), Key: aws.String(sourceKey), }) diff --git a/weed/storage/backend/s3_backend/s3_sessions.go b/weed/storage/backend/s3_backend/s3_sessions.go index 52c6d0c1b..5fdbcb66b 100644 --- a/weed/storage/backend/s3_backend/s3_sessions.go +++ b/weed/storage/backend/s3_backend/s3_sessions.go @@ -59,4 +59,4 @@ func deleteFromS3(sess s3iface.S3API, sourceBucket string, sourceKey string) (er Key: aws.String(sourceKey), }) return err -} \ No newline at end of file +}