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

do NOT sync storage server info to tracker leader

pull/56/merge
yuqing 2017-03-28 10:16:35 +08:00
parent 51e9da9a77
commit b94ba24c2e
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
HISTORY
View File

@ -1,9 +1,10 @@
Version 5.10 2017-03-08 Version 5.10 2017-03-28
* use fc_safe_read instead of read, and fc_safe_write instead of write * use fc_safe_read instead of read, and fc_safe_write instead of write
you must upgrade libfastcommon to V1.35 or later you must upgrade libfastcommon to V1.35 or later
* fix getFileContentEx read bytes, * fix getFileContentEx read bytes,
you must upgrade libfastcommon to V1.36 or later you must upgrade libfastcommon to V1.36 or later
* do NOT sync storage server info to tracker leader
Version 5.09 2016-12-29 Version 5.09 2016-12-29
* bug fixed: list_all_groups expand buffer auto for so many groups * bug fixed: list_all_groups expand buffer auto for so many groups

14
tracker/tracker_service.c
View File

@ -422,7 +422,6 @@ static int tracker_check_and_sync(struct fast_task_info *pTask, \
pClientInfo->pGroup->trunk_chg_count; pClientInfo->pGroup->trunk_chg_count;
p = (char *)pDestServer; p = (char *)pDestServer;
} }
}
if (pClientInfo->pStorage->chg_count != pClientInfo->pGroup->chg_count) if (pClientInfo->pStorage->chg_count != pClientInfo->pGroup->chg_count)
{ {
@ -448,6 +447,7 @@ static int tracker_check_and_sync(struct fast_task_info *pTask, \
pClientInfo->pGroup->chg_count; pClientInfo->pGroup->chg_count;
p = (char *)pDestServer; p = (char *)pDestServer;
} }
}
pTask->length = p - pTask->data; pTask->length = p - pTask->data;
return status; return status;
@ -743,10 +743,20 @@ static int tracker_deal_storage_replica_chg(struct fast_task_info *pTask)
} }
pTask->length = sizeof(TrackerHeader); pTask->length = sizeof(TrackerHeader);
if (g_if_leader_self)
{
logDebug("file: "__FILE__", line: %d, " \
"client ip addr: %s, ignore storage info sync, "
"server_count: %d", __LINE__, pTask->client_ip, server_count);
return 0;
}
else
{
briefServers = (FDFSStorageBrief *)(pTask->data + sizeof(TrackerHeader)); briefServers = (FDFSStorageBrief *)(pTask->data + sizeof(TrackerHeader));
return tracker_mem_sync_storages(((TrackerClientInfo *)pTask->arg)->pGroup, \ return tracker_mem_sync_storages(((TrackerClientInfo *)pTask->arg)->pGroup,
briefServers, server_count); briefServers, server_count);
} }
}
static int tracker_deal_report_trunk_fid(struct fast_task_info *pTask) static int tracker_deal_report_trunk_fid(struct fast_task_info *pTask)
{ {