Browse Source
go fmt
Signed-off-by: Lei Liu <liul.stone@gmail.com>
pull/1142/head
Lei Liu
5 years ago
No known key found for this signature in database
GPG Key ID: CFEC474454780D7B
4 changed files with
9 additions and
8 deletions
-
weed/command/mount_linux.go
-
weed/pb/proto_read_write_test.go
-
weed/server/volume_grpc_tier.go
-
weed/shell/command_volume_tier.go
|
|
@ -1,6 +1,8 @@ |
|
|
|
package command |
|
|
|
|
|
|
|
import ( |
|
|
|
"strings" |
|
|
|
|
|
|
|
"github.com/chrislusf/seaweedfs/weed/util" |
|
|
|
"github.com/seaweedfs/fuse" |
|
|
|
) |
|
|
|
|
|
@ -18,7 +18,7 @@ func TestJsonpMarshalUnmarshal(t *testing.T) { |
|
|
|
|
|
|
|
m := jsonpb.Marshaler{ |
|
|
|
EmitDefaults: true, |
|
|
|
Indent: " ", |
|
|
|
Indent: " ", |
|
|
|
} |
|
|
|
|
|
|
|
if text, err := m.MarshalToString(tv); err != nil { |
|
|
@ -40,5 +40,4 @@ func TestJsonpMarshalUnmarshal(t *testing.T) { |
|
|
|
|
|
|
|
fmt.Printf("unmarshalled: %+v\n", tv1) |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
@ -35,4 +35,4 @@ func uploadFileToRemote(ctx context.Context, req *volume_server_pb.VolumeTierCop |
|
|
|
println("copying dat file of", f.Name(), "to remote") |
|
|
|
|
|
|
|
return nil |
|
|
|
} |
|
|
|
} |
|
|
@ -82,11 +82,11 @@ func doVolumeTier(ctx context.Context, commandEnv *CommandEnv, collection string |
|
|
|
|
|
|
|
// mark the volume as readonly
|
|
|
|
/* |
|
|
|
err = markVolumeReadonly(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), locations) |
|
|
|
if err != nil { |
|
|
|
return fmt.Errorf("mark volume %d as readonly on %s: %v", vid, locations[0].Url, err) |
|
|
|
} |
|
|
|
*/ |
|
|
|
err = markVolumeReadonly(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), locations) |
|
|
|
if err != nil { |
|
|
|
return fmt.Errorf("mark volume %d as readonly on %s: %v", vid, locations[0].Url, err) |
|
|
|
} |
|
|
|
*/ |
|
|
|
|
|
|
|
// copy the .dat file to remote tier
|
|
|
|
err = copyDatToRemoteTier(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), collection, locations[0].Url, dest) |
|
|
|