diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2019-01-12 17:26:51 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-12 17:26:51 -0800 |
| commit | 2ff95ead5737421323eea624ac98a8510fd2efaa (patch) | |
| tree | 8b1a175bbcd00088d7d5d4ff5cf4c749b615c238 /weed/server/master_grpc_server.go | |
| parent | fc3c38d0b8663c73524e1c2070fc29241f62b38e (diff) | |
| parent | b71d6f4b886b7def4e03208f00dec101ea29412e (diff) | |
| download | seaweedfs-2ff95ead5737421323eea624ac98a8510fd2efaa.tar.xz seaweedfs-2ff95ead5737421323eea624ac98a8510fd2efaa.zip | |
Merge pull request #832 from PapaYofen/fix-830
Fix https://github.com/chrislusf/seaweedfs/issues/830
Diffstat (limited to 'weed/server/master_grpc_server.go')
| -rw-r--r-- | weed/server/master_grpc_server.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index d2c86598e..93dce59d8 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "time" "github.com/chrislusf/raft" "github.com/chrislusf/seaweedfs/weed/glog" @@ -172,6 +173,7 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ } }() + ticker := time.NewTicker(5 * time.Second) for { select { case message := <-messageChan: @@ -179,6 +181,10 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ glog.V(0).Infof("=> client %v: %+v", clientName, message) return err } + case <-ticker.C: + if !ms.Topo.IsLeader() { + return raft.NotLeaderError + } case <-stopChan: return nil } |