From 68fd3f5b1fcbb03d20eafabcb28156d72d4b3e99 Mon Sep 17 00:00:00 2001
From: Yu Qing <yuqing@yongche.com>
Date: Thu, 10 Aug 2017 16:01:14 +0800
Subject: [PATCH] code refine for rare case

---
 HISTORY                        | 3 +++
 tracker/tracker_relationship.c | 8 ++++++++
 tracker/tracker_service.c      | 1 +
 3 files changed, 12 insertions(+)

diff --git a/HISTORY b/HISTORY
index d3acfee..a18751c 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,4 +1,7 @@
 
+Version 5.12  2017-08-10
+ * code refine for rare case
+
 Version 5.11  2017-05-26
  * bug fixed: file_offset has no effect when use trunk file
  * add storage access log header
diff --git a/tracker/tracker_relationship.c b/tracker/tracker_relationship.c
index 78ae19f..f48f14c 100644
--- a/tracker/tracker_relationship.c
+++ b/tracker/tracker_relationship.c
@@ -208,6 +208,10 @@ static int relationship_get_tracker_leader(TrackerRunningStatus *pTrackerStatus)
 	count = pStatus - trackerStatus;
 	if (count == 0)
 	{
+		logError("file: "__FILE__", line: %d, "
+                "get tracker status fail, "
+                "tracker server count: %d", __LINE__,
+                g_tracker_servers.server_count);
 		return result == 0 ? ENOENT : result;
 	}
 
@@ -350,6 +354,7 @@ static int relationship_notify_leader_changed(ConnectionInfo *pLeader)
 		return result;
 	}
 
+	result = ENOENT;
 	success_count = 0;
 	for (pTrackerServer=g_tracker_servers.servers; \
 		pTrackerServer<pTrackerEnd; pTrackerServer++)
@@ -420,6 +425,9 @@ static int relationship_select_leader()
 				g_tracker_servers.leader_index >= \
 				g_tracker_servers.server_count)
 			{
+                logError("file: "__FILE__", line: %d, "
+                        "invalid leader_index: %d",
+                        __LINE__, g_tracker_servers.leader_index);
 				g_tracker_servers.leader_index = -1;
 				return EINVAL;
 			}
diff --git a/tracker/tracker_service.c b/tracker/tracker_service.c
index 6e96e61..0f3e870 100644
--- a/tracker/tracker_service.c
+++ b/tracker/tracker_service.c
@@ -968,6 +968,7 @@ static int tracker_deal_commit_next_leader(struct fast_task_info *pTask)
 	}
 
 	g_tracker_servers.leader_index = server_index;
+    g_next_leader_index = -1;
 	if (leader.port == g_server_port && is_local_host_ip(leader.ip_addr))
 	{
 		g_if_leader_self = true;