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

check item thread_stack_size in storage.conf

pull/8/merge
yuqing 2015-05-12 14:40:05 +08:00
parent f412329e2e
commit 3f77aa8f42
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,7 +1,9 @@
Version 5.06 2014-12-04 Version 5.06 2015-05-12
* compile passed in mac OS Darwin * compile passed in mac OS Darwin
* correct scripts in subdir init.d * correct scripts in subdir init.d
* check item thread_stack_size in storage.conf, you must
upgrade libfastcommon to V1.14 or later
Version 5.05 2014-11-22 Version 5.05 2014-11-22
* tracker_mem.c log more info * tracker_mem.c log more info

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.5 %define FDFSVersion 5.0.6
Name: %{FastDFS} Name: %{FastDFS}
Version: %{FDFSVersion} Version: %{FDFSVersion}

6
storage/storage_func.c
View File

@ -1530,12 +1530,12 @@ int storage_func_init(const char *filename, \
} }
g_thread_stack_size = (int)thread_stack_size; g_thread_stack_size = (int)thread_stack_size;
if (g_thread_stack_size < 64 * 1024) if (g_thread_stack_size < FAST_WRITE_BUFF_SIZE + 64 * 1024)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, " \
"item \"thread_stack_size\" %d is invalid, " \ "item \"thread_stack_size\" %d is invalid, " \
"which < %d", __LINE__, g_thread_stack_size, \ "which < %d", __LINE__, g_thread_stack_size, \
64 * 1024); FAST_WRITE_BUFF_SIZE + 64 * 1024);
result = EINVAL; result = EINVAL;
break; break;
} }
@ -2155,7 +2155,7 @@ int recv_file_serialized(int sock, const char *filename, \
const int64_t file_bytes) const int64_t file_bytes)
{ {
int fd; int fd;
char buff[FDFS_WRITE_BUFF_SIZE]; char buff[FAST_WRITE_BUFF_SIZE];
int64_t remain_bytes; int64_t remain_bytes;
int recv_bytes; int recv_bytes;
int result; int result;