diff --git a/HISTORY b/HISTORY index 569cca0..5ec006f 100644 --- a/HISTORY +++ b/HISTORY @@ -1,4 +1,7 @@ +Version 5.05 2014-11-21 + * tracker_mem.c log more info + Version 5.04 2014-09-16 * add fastdfs.spec for build RPM on Linux * depend on libfastcommon diff --git a/common/fdfs_global.c b/common/fdfs_global.c index 6f6d910..9d4d92e 100644 --- a/common/fdfs_global.c +++ b/common/fdfs_global.c @@ -23,7 +23,7 @@ int g_fdfs_connect_timeout = DEFAULT_CONNECT_TIMEOUT; int g_fdfs_network_timeout = DEFAULT_NETWORK_TIMEOUT; 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; ConnectionPool g_connection_pool; int g_connection_pool_max_idle_time = 3600; diff --git a/fastdfs.spec b/fastdfs.spec index 0839c6b..0b9d047 100644 --- a/fastdfs.spec +++ b/fastdfs.spec @@ -2,7 +2,7 @@ %define FDFSServer fastdfs-server %define FDFSClient libfdfsclient %define FDFSTool fastdfs-tool -%define FDFSVersion 5.0.4 +%define FDFSVersion 5.0.5 Name: %{FastDFS} Version: %{FDFSVersion} diff --git a/tracker/tracker_mem.c b/tracker/tracker_mem.c index 78e8e37..7709fdd 100644 --- a/tracker/tracker_mem.c +++ b/tracker/tracker_mem.c @@ -4272,6 +4272,9 @@ int tracker_mem_add_group_and_storage(TrackerClientInfo *pClientInfo, \ if (result != 0) { tracker_mem_file_unlock(); + logError("file: "__FILE__", line: %d, " + "get sys files from other trackers fail, errno: %d", + __LINE__, result); return EAGAIN; } @@ -4289,6 +4292,9 @@ int tracker_mem_add_group_and_storage(TrackerClientInfo *pClientInfo, \ pJoinBody, NULL)) != 0) { tracker_mem_file_unlock(); + logError("file: "__FILE__", line: %d, " + "get sys files from other trackers fail, errno: %d", + __LINE__, result); return EAGAIN; }