diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-03-04 13:00:10 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-03-04 13:00:10 -0800 |
| commit | 0898e6c38ebb134ee00c19505dd1b2b23b18ac16 (patch) | |
| tree | 51b036e628d172a560471f14ab4a8a92b1c808b6 | |
| parent | d312c55bbed8ef69dc11bf024024c7b50f56f5b2 (diff) | |
| parent | b13260fd45cd157a477a28150b39b4aebda2c61e (diff) | |
| download | seaweedfs-0898e6c38ebb134ee00c19505dd1b2b23b18ac16.tar.xz seaweedfs-0898e6c38ebb134ee00c19505dd1b2b23b18ac16.zip | |
Merge branch 'master' of https://github.com/chrislusf/seaweedfs
| -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 } } } |