pdxx
/
fastdfs
mirror of https://github.com/happyfish100/fastdfs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code refine for rare case

pull/170/head
Yu Qing 2017-08-10 16:01:14 +08:00
parent 1e50b4f21a
commit 68fd3f5b1f
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -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

8
tracker/tracker_relationship.c
View File

@ -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;
}

1
tracker/tracker_service.c
View File

@ -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;