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

tracker_mem.c log more info

pull/48/head
yuqing 2014-11-21 15:40:22 +08:00
parent f19daf51ee
commit 30c7949bf8
4 changed files with 11 additions and 2 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.05 2014-11-21
* tracker_mem.c log more info
Version 5.04 2014-09-16 Version 5.04 2014-09-16
* add fastdfs.spec for build RPM on Linux * add fastdfs.spec for build RPM on Linux
* depend on libfastcommon * depend on libfastcommon

2
common/fdfs_global.c
View File

@ -23,7 +23,7 @@
int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT; int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT;
int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT;
char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'}; char g_fdfs_base_path[MAX_PATH_SIZE] = {'/', 't', 'm', 'p', '\0'};
Version g_fdfs_version = {5, 4}; Version g_fdfs_version = {5, 5};
bool g_use_connection_pool = false; bool g_use_connection_pool = false;
ConnectionPool g_connection_pool; ConnectionPool g_connection_pool;
int g_connection_pool_max_idle_time = 3600; int g_connection_pool_max_idle_time = 3600;

2
fastdfs.spec
View File

@ -2,7 +2,7 @@
%define FDFSServer fastdfs-server %define FDFSServer fastdfs-server
%define FDFSClient libfdfsclient %define FDFSClient libfdfsclient
%define FDFSTool fastdfs-tool %define FDFSTool fastdfs-tool
%define FDFSVersion 5.0.4 %define FDFSVersion 5.0.5
Name: %{FastDFS} Name: %{FastDFS}
Version: %{FDFSVersion} Version: %{FDFSVersion}

6
tracker/tracker_mem.c
View File

@ -4272,6 +4272,9 @@ int tracker_mem_add_group_and_storage(TrackerClientInfo *pClientInfo, \
if (result != 0) if (result != 0)
{ {
tracker_mem_file_unlock(); tracker_mem_file_unlock();
logError("file: "__FILE__", line: %d, "
"get sys files from other trackers fail, errno: %d",
__LINE__, result);
return EAGAIN; return EAGAIN;
} }
@ -4289,6 +4292,9 @@ int tracker_mem_add_group_and_storage(TrackerClientInfo *pClientInfo, \
pJoinBody, NULL)) != 0) pJoinBody, NULL)) != 0)
{ {
tracker_mem_file_unlock(); tracker_mem_file_unlock();
logError("file: "__FILE__", line: %d, "
"get sys files from other trackers fail, errno: %d",
__LINE__, result);
return EAGAIN; return EAGAIN;
} }