lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 18:33:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #869 from PapaYofen/fix-825

Browse Source 
Fix https://github.com/chrislusf/seaweedfs/issues/825#issuecomment-46…
This commit is contained in:
Chris Lu
2019-03-04 07:22:22 -08:00
committed by GitHub
parent 219b651bc3 f233bbe9c0
commit b13260fd45
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,7 +102,9 @@ 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 {
@@ -110,7 +112,6 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
} }
} }
} }
}
// 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.
// And clients gets the up-to-date list of volume locations // And clients gets the up-to-date list of volume locations