diff options
Diffstat (limited to 'unmaintained/diff_volume_servers/diff_volume_servers.go')
| -rw-r--r-- | unmaintained/diff_volume_servers/diff_volume_servers.go | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/unmaintained/diff_volume_servers/diff_volume_servers.go b/unmaintained/diff_volume_servers/diff_volume_servers.go index 27a537617..e8361a6cf 100644 --- a/unmaintained/diff_volume_servers/diff_volume_servers.go +++ b/unmaintained/diff_volume_servers/diff_volume_servers.go @@ -6,13 +6,9 @@ import ( "errors" "flag" "fmt" - "io" - "math" - "os" - "strings" - "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/operation" + "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" "github.com/chrislusf/seaweedfs/weed/security" "github.com/chrislusf/seaweedfs/weed/storage/idx" @@ -20,6 +16,9 @@ import ( "github.com/chrislusf/seaweedfs/weed/storage/types" "github.com/chrislusf/seaweedfs/weed/util" "google.golang.org/grpc" + "io" + "math" + "os" ) var ( @@ -45,13 +44,13 @@ func main() { grpcDialOption = security.LoadClientTLS(util.GetViper(), "grpc.client") vid := uint32(*volumeId) - servers := strings.Split(*serversStr, ",") + servers := pb.ServerAddresses(*serversStr).ToAddresses() if len(servers) < 2 { glog.Fatalf("You must specify more than 1 server\n") } - var referenceServer string + var referenceServer pb.ServerAddress var maxOffset int64 - allFiles := map[string]map[types.NeedleId]needleState{} + allFiles := map[pb.ServerAddress]map[types.NeedleId]needleState{} for _, addr := range servers { files, offset, err := getVolumeFiles(vid, addr) if err != nil { @@ -121,7 +120,7 @@ type needleState struct { size types.Size } -func getVolumeFiles(v uint32, addr string) (map[types.NeedleId]needleState, int64, error) { +func getVolumeFiles(v uint32, addr pb.ServerAddress) (map[types.NeedleId]needleState, int64, error) { var idxFile *bytes.Reader err := operation.WithVolumeServerClient(addr, grpcDialOption, func(vs volume_server_pb.VolumeServerClient) error { ctx, cancel := context.WithCancel(context.Background()) @@ -179,7 +178,7 @@ func getVolumeFiles(v uint32, addr string) (map[types.NeedleId]needleState, int6 return files, maxOffset, nil } -func getNeedleFileId(v uint32, nid types.NeedleId, addr string) (string, error) { +func getNeedleFileId(v uint32, nid types.NeedleId, addr pb.ServerAddress) (string, error) { var id string err := operation.WithVolumeServerClient(addr, grpcDialOption, func(vs volume_server_pb.VolumeServerClient) error { resp, err := vs.VolumeNeedleStatus(context.Background(), &volume_server_pb.VolumeNeedleStatusRequest{ |