diff options
| author | Chris Lu <chrislusf@users.noreply.github.com> | 2019-03-04 07:22:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-04 07:22:22 -0800 |
| commit | b13260fd45cd157a477a28150b39b4aebda2c61e (patch) | |
| tree | 2f9fea32074cd1d8d5f83fe82908f77083faf7f1 | |
| parent | 219b651bc3642b74e5ffd824a0fedc904ec9796c (diff) | |
| parent | f233bbe9c01c9b721de914543f38dc9fd0e8bf31 (diff) | |
| download | seaweedfs-b13260fd45cd157a477a28150b39b4aebda2c61e.tar.xz seaweedfs-b13260fd45cd157a477a28150b39b4aebda2c61e.zip | |
Merge pull request #869 from PapaYofen/fix-825
Fix https://github.com/chrislusf/seaweedfs/issues/825#issuecomment-46…
| -rw-r--r-- | weed/server/master_grpc_server.go | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 043a6ff51..4c8ff5700 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -102,12 +102,13 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ // tell the volume servers about the leader newLeader, err := t.Leader() - if err == nil { - if err := stream.Send(&master_pb.HeartbeatResponse{ - Leader: newLeader, - }); err != nil { - return err - } + if err != nil { + return err + } + if err := stream.Send(&master_pb.HeartbeatResponse{ + Leader: newLeader, + }); err != nil { + return err } } } |