From f233bbe9c01c9b721de914543f38dc9fd0e8bf31 Mon Sep 17 00:00:00 2001
From: chenwanli <chenwanli@sensetime.com>
Date: Mon, 4 Mar 2019 12:43:43 +0800
Subject: [PATCH] Fix
 https://github.com/chrislusf/seaweedfs/issues/825#issuecomment-469097375

---
 weed/server/master_grpc_server.go | 13 +++++++------
 1 file 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
 		}
 	}
 }