aboutsummaryrefslogtreecommitdiff
path: root/weed/server
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-05-07 13:33:44 -0700
committerchrislu <chris.lu@gmail.com>2023-05-07 13:33:44 -0700
commit4511edc8717b1f54f23469ca0ad20d199c2db2eb (patch)
tree1598974f35c520fd793867f42c4ad4b941e88a9f /weed/server
parent6fdff0bb1857da8ce18668518e4ab19e5540b347 (diff)
downloadseaweedfs-4511edc8717b1f54f23469ca0ad20d199c2db2eb.tar.xz
seaweedfs-4511edc8717b1f54f23469ca0ad20d199c2db2eb.zip
update raft
Diffstat (limited to 'weed/server')
-rw-r--r--weed/server/raft_server.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/weed/server/raft_server.go b/weed/server/raft_server.go
index d718ecac7..16736eb5b 100644
--- a/weed/server/raft_server.go
+++ b/weed/server/raft_server.go
@@ -3,6 +3,7 @@ package weed_server
import (
"encoding/json"
transport "github.com/Jille/raft-grpc-transport"
+ "github.com/seaweedfs/raft/protobuf"
"io"
"math/rand"
"os"
@@ -33,6 +34,8 @@ type RaftServerOption struct {
}
type RaftServer struct {
+ protobuf.UnimplementedRaftServer
+ raftGrpcServer *raft.GrpcServer
peers map[string]pb.ServerAddress // initial peers to join with
raftServer raft.Server
RaftHashicorp *hashicorpRaft.Raft
@@ -40,7 +43,6 @@ type RaftServer struct {
dataDir string
serverAddr pb.ServerAddress
topo *topology.Topology
- *raft.GrpcServer
}
type StateMachine struct {
@@ -162,7 +164,7 @@ func NewRaftServer(option *RaftServerOption) (*RaftServer, error) {
}
}
- s.GrpcServer = raft.NewGrpcServer(s.raftServer)
+ s.raftGrpcServer = raft.NewGrpcServer(s.raftServer)
glog.V(0).Infof("current cluster leader: %v", s.raftServer.Leader())