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

clear sync src id when tracker response ENOENT

pull/56/merge
yuqing 2017-03-29 14:25:51 +08:00
parent 4c28748da0
commit a0c1140e1c
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
HISTORY
View File

@ -6,6 +6,7 @@ Version 5.10 2017-03-29
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 * do NOT sync storage server info to tracker leader
* adjust parameter store_server when use_trunk_file is true * adjust parameter store_server when use_trunk_file is true
* clear sync src id when tracker response ENOENT
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

23
storage/tracker_client_thread.c
View File

@ -1819,12 +1819,23 @@ static int tracker_sync_notify(ConnectionInfo *pTrackerServer)
} }
if ((result=fdfs_recv_header(pTrackerServer, &in_bytes)) != 0) if ((result=fdfs_recv_header(pTrackerServer, &in_bytes)) != 0)
{ {
logError("file: "__FILE__", line: %d, " if (result == ENOENT)
"fdfs_recv_header fail, result: %d", {
__LINE__, result); logWarning("file: "__FILE__", line: %d, "
return result; "clear sync src id: %s",
} __LINE__, g_sync_src_id);
*g_sync_src_id = '\0';
storage_write_to_sync_ini_file();
}
else
{
logError("file: "__FILE__", line: %d, "
"fdfs_recv_header fail, result: %d",
__LINE__, result);
return result;
}
}
if (in_bytes != 0) if (in_bytes != 0)
{ {