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

change comment/information in config files and codes

pull/484/head
YuQing 2019-11-22 09:26:47 +08:00
parent aeb171dca7
commit da7300bc9b
5 changed files with 30 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
conf/storage.conf
View File

@ -24,31 +24,37 @@ client_bind=true
port=23000 port=23000
# connect timeout in seconds # connect timeout in seconds
# default value is 30s # default value is 30
# Note: in the intranet network (LAN), 2 seconds is enough. # Note: in the intranet network (LAN), 2 seconds is enough.
connect_timeout=10 connect_timeout=10
# network timeout in seconds for send and recv # network timeout in seconds for send and recv
# default value is 30s # default value is 30
network_timeout=60 network_timeout=60
# heart beat interval in seconds # the heart beat interval in seconds
# the storage server send heartbeat to tracker server periodically
# default value is 30
heart_beat_interval=30 heart_beat_interval=30
# disk usage report interval in seconds # disk usage report interval in seconds
# the storage server send disk usage report to tracker server periodically
# default value is 300
stat_report_interval=60 stat_report_interval=60
# the base path to store data and log files # the base path to store data and log files
# NOTE: the binlog files maybe are large, make sure
# the base path has enough disk space
base_path=/home/yuqing/fastdfs base_path=/home/yuqing/fastdfs
# max concurrent connections the server supported # max concurrent connections the server supported
# default value is 256
# more max_connections means more memory will be used
# you should set this parameter larger, eg. 10240 # you should set this parameter larger, eg. 10240
# default value is 256
max_connections=1024 max_connections=1024
# the buff size to recv / send data from/to network # the buff size to recv / send data from/to network
# this parameter must more than 8KB # this parameter must more than 8KB
# 256KB or 512KB is recommended
# default value is 64KB # default value is 64KB
# since V2.00 # since V2.00
buff_size = 256KB buff_size = 256KB
@ -295,7 +301,7 @@ connection_pool_max_idle_time = 3600
# if compress the binlog files by gzip # if compress the binlog files by gzip
# default value is false # default value is false
# since V6.01 # since V6.01
compress_binlog = false compress_binlog = true
# try to compress binlog time, time format: Hour:Minute # try to compress binlog time, time format: Hour:Minute
# Hour from 0 to 23, Minute from 0 to 59 # Hour from 0 to 23, Minute from 0 to 59

9
conf/tracker.conf
View File

@ -11,19 +11,20 @@ bind_addr=
port=22122 port=22122
# connect timeout in seconds # connect timeout in seconds
# default value is 30s # default value is 30
# Note: in the intranet network (LAN), 2 seconds is enough. # Note: in the intranet network (LAN), 2 seconds is enough.
connect_timeout=10 connect_timeout=10
# network timeout in seconds for send and recv # network timeout in seconds for send and recv
# default value is 30s # default value is 30
network_timeout=60 network_timeout=60
# the base path to store data and log files # the base path to store data and log files
base_path=/home/yuqing/fastdfs base_path=/home/yuqing/fastdfs
# max concurrent connections this server supported # max concurrent connections this server support
# you should set this parameter larger, eg. 102400 # you should set this parameter larger, eg. 10240
# default value is 256
max_connections=1024 max_connections=1024
# accept thread count # accept thread count

8
storage/storage_service.c
View File

@ -1834,9 +1834,11 @@ static void *accept_thread_entrance(void* arg)
pTask = free_queue_pop(); pTask = free_queue_pop();
if (pTask == NULL) if (pTask == NULL)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"malloc task buff failed", \ "malloc task buff fail, you should "
__LINE__); "increase the parameter \"max_connections\" "
"in storage.conf, or check your applications "
"for connection leaks", __LINE__);
close(incomesock); close(incomesock);
continue; continue;
} }

9
tracker/tracker_nio.c
View File

@ -134,10 +134,11 @@ void recv_notify_read(int sock, short event, void *arg)
pTask = free_queue_pop(); pTask = free_queue_pop();
if (pTask == NULL) if (pTask == NULL)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"malloc task buff failed, you should " \ "malloc task buff fail, you should "
"increase the parameter: max_connections", \ "increase the parameter \"max_connections\" "
__LINE__); "in tracker.conf, or check your applications "
"for connection leaks", __LINE__);
close(incomesock); close(incomesock);
continue; continue;
} }

6
tracker/tracker_service.c
View File

@ -588,14 +588,14 @@ static int tracker_deal_changelog_req(struct fast_task_info *pTask)
break; break;
} }
memcpy(group_name, pTask->data + sizeof(TrackerHeader), \ memcpy(group_name, pTask->data + sizeof(TrackerHeader),
FDFS_GROUP_NAME_MAX_LEN); FDFS_GROUP_NAME_MAX_LEN);
*(group_name + FDFS_GROUP_NAME_MAX_LEN) = '\0'; *(group_name + FDFS_GROUP_NAME_MAX_LEN) = '\0';
pGroup = tracker_mem_get_group(group_name); pGroup = tracker_mem_get_group(group_name);
if (pGroup == NULL) if (pGroup == NULL)
{ {
logError("file: "__FILE__", line: %d, " \ logError("file: "__FILE__", line: %d, "
"client ip: %s, invalid group_name: %s", \ "client ip: %s, group_name: %s not exist",
__LINE__, pTask->client_ip, group_name); __LINE__, pTask->client_ip, group_name);
result = ENOENT; result = ENOENT;
break; break;