diff options
| author | Chris Lu <chris.lu@uber.com> | 2019-03-19 05:47:41 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@uber.com> | 2019-03-19 05:47:41 -0700 |
| commit | da871896c345372780c35de7364b42d910935c53 (patch) | |
| tree | 32a8bf8419c3533a5d59ab194a2a6dcc664c95b2 /weed/server | |
| parent | 916b809c086e94208eabe2af1086bcb1289ed298 (diff) | |
| download | seaweedfs-da871896c345372780c35de7364b42d910935c53.tar.xz seaweedfs-da871896c345372780c35de7364b42d910935c53.zip | |
weed filer: set grpc port to port + 10000
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/raft_server.go | 4 | ||||
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/raft_server.go b/weed/server/raft_server.go index 4be13810f..88320ed98 100644 --- a/weed/server/raft_server.go +++ b/weed/server/raft_server.go @@ -61,7 +61,7 @@ func NewRaftServer(grpcDialOption grpc.DialOption, peers []string, serverAddr st s.raftServer.Start() for _, peer := range s.peers { - s.raftServer.AddPeer(peer, util.ServerToGrpcAddress(peer, 19333)) + s.raftServer.AddPeer(peer, util.ServerToGrpcAddress(peer)) } s.GrpcServer = raft.NewGrpcServer(s.raftServer) @@ -72,7 +72,7 @@ func NewRaftServer(grpcDialOption grpc.DialOption, peers []string, serverAddr st _, err := s.raftServer.Do(&raft.DefaultJoinCommand{ Name: s.raftServer.Name(), - ConnectionString: util.ServerToGrpcAddress(s.serverAddr, 19333), + ConnectionString: util.ServerToGrpcAddress(s.serverAddr), }) if err != nil { diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index f6ed8ee23..94e99c8f6 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -31,7 +31,7 @@ func (vs *VolumeServer) heartbeat() { if newLeader != "" { master = newLeader } - masterGrpcAddress, parseErr := util.ParseServerToGrpcAddress(master, 0) + masterGrpcAddress, parseErr := util.ParseServerToGrpcAddress(master) if parseErr != nil { glog.V(0).Infof("failed to parse master grpc %v", masterGrpcAddress) continue |