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

storage_report_ip_changed ignore result EEXIST

pull/484/head
YuQing 2019-11-27 20:33:56 +08:00
parent 80c9930f22
commit df2fd2069b
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
conf/storage.conf
View File

@ -173,8 +173,9 @@ allow_hosts=*
# 1: random, distributted by hash code # 1: random, distributted by hash code
file_distribute_path_mode=0 file_distribute_path_mode=0
# valid when file_distribute_to_path is set to 0 (round robin), # valid when file_distribute_to_path is set to 0 (round robin).
# when the written file count reaches this number, then rotate to next path # when the written file count reaches this number, then rotate to next path.
# rotate to the first path (00/00) after the last path (such as FF/FF).
# default value is 100 # default value is 100
file_distribute_rotate_count=100 file_distribute_rotate_count=100

15
storage/storage_ip_changed_dealer.c
View File

@ -92,10 +92,11 @@ static int storage_report_ip_changed(ConnectionInfo *pTrackerServer)
} }
pInBuff = in_buff; pInBuff = in_buff;
result = fdfs_recv_response(pTrackerServer, \ result = fdfs_recv_response(pTrackerServer,
&pInBuff, 0, &in_bytes); &pInBuff, 0, &in_bytes);
if (result == 0 || result == EALREADY || result == ENOENT) if (result == 0 || result == EALREADY || result == ENOENT
|| result == EEXIST)
{ {
if (result != 0) if (result != 0)
{ {
@ -107,11 +108,11 @@ static int storage_report_ip_changed(ConnectionInfo *pTrackerServer)
} }
else else
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"tracker server %s:%d, recv data fail or " \ "tracker server %s:%d, recv data fail or "
"response status != 0, " \ "response status != 0, "
"errno: %d, error info: %s", \ "errno: %d, error info: %s",
__LINE__, pTrackerServer->ip_addr, \ __LINE__, pTrackerServer->ip_addr,
pTrackerServer->port, result, STRERROR(result)); pTrackerServer->port, result, STRERROR(result));
return result == EBUSY ? 0 : result; return result == EBUSY ? 0 : result;
} }