Signed-off-by: Lei Liu <liul.stone@gmail.com>
This commit is contained in:
Lei Liu 2019-11-27 22:57:14 +08:00
parent 4c87b222f1
commit 1ba3456ac2
No known key found for this signature in database
GPG key ID: CFEC474454780D7B
4 changed files with 9 additions and 8 deletions

View file

@ -1,6 +1,8 @@
package command package command
import ( import (
"strings"
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"github.com/seaweedfs/fuse" "github.com/seaweedfs/fuse"
) )

View file

@ -18,7 +18,7 @@ func TestJsonpMarshalUnmarshal(t *testing.T) {
m := jsonpb.Marshaler{ m := jsonpb.Marshaler{
EmitDefaults: true, EmitDefaults: true,
Indent: " ", Indent: " ",
} }
if text, err := m.MarshalToString(tv); err != nil { if text, err := m.MarshalToString(tv); err != nil {
@ -40,5 +40,4 @@ func TestJsonpMarshalUnmarshal(t *testing.T) {
fmt.Printf("unmarshalled: %+v\n", tv1) fmt.Printf("unmarshalled: %+v\n", tv1)
} }

View file

@ -35,4 +35,4 @@ func uploadFileToRemote(ctx context.Context, req *volume_server_pb.VolumeTierCop
println("copying dat file of", f.Name(), "to remote") println("copying dat file of", f.Name(), "to remote")
return nil return nil
} }

View file

@ -82,11 +82,11 @@ func doVolumeTier(ctx context.Context, commandEnv *CommandEnv, collection string
// mark the volume as readonly // mark the volume as readonly
/* /*
err = markVolumeReadonly(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), locations) err = markVolumeReadonly(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), locations)
if err != nil { if err != nil {
return fmt.Errorf("mark volume %d as readonly on %s: %v", vid, locations[0].Url, err) return fmt.Errorf("mark volume %d as readonly on %s: %v", vid, locations[0].Url, err)
} }
*/ */
// copy the .dat file to remote tier // copy the .dat file to remote tier
err = copyDatToRemoteTier(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), collection, locations[0].Url, dest) err = copyDatToRemoteTier(ctx, commandEnv.option.GrpcDialOption, needle.VolumeId(vid), collection, locations[0].Url, dest)