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

upgrade version to V6.0.1

pull/348/head
YuQing 2019-10-25 14:49:51 +08:00
parent 6b1f5e0cca
commit 1943f3d49a
3 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fastdfs.spec
View File

@ -3,7 +3,7 @@
%define FDFSClient libfdfsclient %define FDFSClient libfdfsclient
%define FDFSClientDevel libfdfsclient-devel %define FDFSClientDevel libfdfsclient-devel
%define FDFSTool fastdfs-tool %define FDFSTool fastdfs-tool
%define FDFSVersion 6.0.0 %define FDFSVersion 6.0.1
%define CommitVersion %(echo $COMMIT_VERSION) %define CommitVersion %(echo $COMMIT_VERSION)
Name: %{FastDFS} Name: %{FastDFS}

39
storage/storage_nio.c
View File

@ -267,23 +267,34 @@ static void client_sock_read(int sock, short event, void *arg)
if (event & IOEVENT_TIMEOUT) if (event & IOEVENT_TIMEOUT)
{ {
if (pClientInfo->total_offset == 0 && pTask->req_count > 0) if (pClientInfo->total_offset == 0)
{ {
pTask->event.timer.expires = g_current_time + if (pTask->req_count > 0)
g_fdfs_network_timeout; {
fast_timer_add(&pTask->thread_data->timer, pTask->event.timer.expires = g_current_time +
&pTask->event.timer); g_fdfs_network_timeout;
fast_timer_add(&pTask->thread_data->timer,
&pTask->event.timer);
}
else
{
logWarning("file: "__FILE__", line: %d, "
"client ip: %s, recv timeout. "
"after the connection is established, "
"you must send a request before %ds timeout",
__LINE__, pTask->client_ip, g_fdfs_network_timeout);
task_finish_clean_up(pTask);
}
} }
else else
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"client ip: %s, recv timeout, " \ "client ip: %s, recv timeout, "
"recv offset: %d, expect length: %d", \ "recv offset: %d, expect length: %d, "
__LINE__, pTask->client_ip, \ "req_count: %"PRId64, __LINE__, pTask->client_ip,
pTask->offset, pTask->length); pTask->offset, pTask->length, pTask->req_count);
task_finish_clean_up(pTask);
task_finish_clean_up(pTask); }
}
return; return;
} }

33
tracker/tracker_nio.c
View File

@ -198,21 +198,32 @@ static void client_sock_read(int sock, short event, void *arg)
if (event & IOEVENT_TIMEOUT) if (event & IOEVENT_TIMEOUT)
{ {
if (pTask->offset == 0 && pTask->req_count > 0) if (pTask->offset == 0)
{ {
pTask->event.timer.expires = g_current_time + if (pTask->req_count > 0)
g_fdfs_network_timeout; {
fast_timer_add(&pTask->thread_data->timer, pTask->event.timer.expires = g_current_time +
&pTask->event.timer); g_fdfs_network_timeout;
fast_timer_add(&pTask->thread_data->timer,
&pTask->event.timer);
}
else
{
logWarning("file: "__FILE__", line: %d, "
"client ip: %s, recv timeout. "
"after the connection is established, "
"you must send a request before %ds timeout",
__LINE__, pTask->client_ip, g_fdfs_network_timeout);
task_finish_clean_up(pTask);
}
} }
else else
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"client ip: %s, recv timeout, " \ "client ip: %s, recv timeout, "
"recv offset: %d, expect length: %d", \ "recv offset: %d, expect length: %d, "
__LINE__, pTask->client_ip, \ "req_count: %"PRId64, __LINE__, pTask->client_ip,
pTask->offset, pTask->length); pTask->offset, pTask->length, pTask->req_count);
task_finish_clean_up(pTask); task_finish_clean_up(pTask);
} }