gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

master able to list all master clients by type

Browse Source
This commit is contained in:
Chris Lu
2020-03-01 22:13:47 -08:00
parent 0ca68a2a6d
commit 6a8484b4ae
14 changed files with 353 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
weed/wdclient/masterclient.go
View File

@@ -6,14 +6,16 @@ import (
"math/rand"
"time"
"google.golang.org/grpc"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/util"
"google.golang.org/grpc"
)
type MasterClient struct {
name string
grpcPort uint32
currentMaster string
masters []string
grpcDialOption grpc.DialOption
@@ -21,9 +23,10 @@ type MasterClient struct {
vidMap
}
func NewMasterClient(grpcDialOption grpc.DialOption, clientName string, masters []string) *MasterClient {
func NewMasterClient(grpcDialOption grpc.DialOption, clientName string, clientGrpcPort uint32, masters []string) *MasterClient {
return &MasterClient{
name: clientName,
grpcPort: clientGrpcPort,
masters: masters,
grpcDialOption: grpcDialOption,
vidMap: newVidMap(),
@@ -72,7 +75,7 @@ func (mc *MasterClient) tryConnectToMaster(master string) (nextHintedLeader stri
return err
}
if err = stream.Send(&master_pb.KeepConnectedRequest{Name: mc.name}); err != nil {
if err = stream.Send(&master_pb.KeepConnectedRequest{Name: mc.name, GrpcPort: mc.grpcPort}); err != nil {
glog.V(0).Infof("%s failed to send to %s: %v", mc.name, master, err)
return err
}