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

Merge branch 'master' of https://github.com/chrislusf/seaweedfs

Browse Source
This commit is contained in:
Chris Lu
2019-03-04 13:00:10 -08:00
parent d312c55bbe b13260fd45
commit 0898e6c38e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed/server/master_grpc_server.go
View File

@@ -102,14 +102,15 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
// tell the volume servers about the leader // tell the volume servers about the leader
newLeader, err := t.Leader() newLeader, err := t.Leader()
if err == nil { if err != nil {
return err
}
if err := stream.Send(&master_pb.HeartbeatResponse{ if err := stream.Send(&master_pb.HeartbeatResponse{
Leader: newLeader, Leader: newLeader,
}); err != nil { }); err != nil {
return err return err
} }
} }
}
} }
// KeepConnected keep a stream gRPC call to the master. Used by clients to know the master is up. // KeepConnected keep a stream gRPC call to the master. Used by clients to know the master is up.