aboutsummaryrefslogtreecommitdiff
path: root/weed/server/raft_server.go
diff options
context:
space:
mode:
authorJonathan Amsterdam <jba@google.com>2019-03-20 16:02:38 -0400
committerJonathan Amsterdam <jba@google.com>2019-03-20 16:02:38 -0400
commite966033098ce13fdda97dd96b309357bd410d8d6 (patch)
treedd401620f393d366e6c6ab80c15589eadfa2aea2 /weed/server/raft_server.go
parent8db82e2b75eb67bc58a4869cc70fb8c5b2c0b97c (diff)
parent977b30e992108e480c883cdd461bf0c8f6598f25 (diff)
downloadseaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.tar.xz
seaweedfs-e966033098ce13fdda97dd96b309357bd410d8d6.zip
Merge branch 'master' of https://github.com/chrislusf/seaweedfs into gocdk
Diffstat (limited to 'weed/server/raft_server.go')
-rw-r--r--weed/server/raft_server.go4
1 files changed, 2 insertions, 2 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 {