diff options
| -rw-r--r-- | weed/command/mount_linux.go | 2 | ||||
| -rw-r--r-- | weed/pb/proto_read_write_test.go | 3 | ||||
| -rw-r--r-- | weed/server/volume_grpc_tier.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_tier.go | 10 |
4 files changed, 9 insertions, 8 deletions
diff --git a/weed/command/mount_linux.go b/weed/command/mount_linux.go index 591951d4f..b49e7fff2 100644 --- a/weed/command/mount_linux.go +++ b/weed/command/mount_linux.go @@ -1,6 +1,8 @@ package command import ( + "strings" + "github.com/chrislusf/seaweedfs/weed/util" "github.com/seaweedfs/fuse" ) diff --git a/weed/pb/proto_read_write_test.go b/weed/pb/proto_read_write_test.go index d86d1b7dd..4c53ffa2f 100644 --- a/weed/pb/proto_read_write_test.go +++ b/weed/pb/proto_read_write_test.go @@ -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) - } diff --git a/weed/server/volume_grpc_tier.go b/weed/server/volume_grpc_tier.go index d910db740..cbd344ed0 100644 --- a/weed/server/volume_grpc_tier.go +++ b/weed/server/volume_grpc_tier.go @@ -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 -}
\ No newline at end of file +} diff --git a/weed/shell/command_volume_tier.go b/weed/shell/command_volume_tier.go index 9dda37bd4..177d3f30d 100644 --- a/weed/shell/command_volume_tier.go +++ b/weed/shell/command_volume_tier.go @@ -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) |