diff --git a/conf/storage.conf b/conf/storage.conf index 1d864eb..8ce66fd 100644 --- a/conf/storage.conf +++ b/conf/storage.conf @@ -48,7 +48,7 @@ stat_report_interval = 60 # eg. the disk free space should > 50GB base_path = /home/yuqing/fastdfs -# max concurrent connections the server supported +# max concurrent connections the server supported, # you should set this parameter larger, eg. 10240 # default value is 256 max_connections = 1024 @@ -61,12 +61,12 @@ max_connections = 1024 buff_size = 256KB # accept thread count -# default value is 1 +# default value is 1 which is recommended # since V4.07 accept_threads = 1 # work thread count -# work thread deal network io +# work threads to deal network io # default value is 4 # since V2.00 work_threads = 4 @@ -113,14 +113,14 @@ write_mark_file_freq = 500 # disk recovery thread count # default value is 1 # since V6.04 -disk_recovery_threads = 1 +disk_recovery_threads = 3 # store path (disk or mount point) count, default value is 1 store_path_count = 1 # store_path#, based on 0, to configure the store paths to store files # if store_path0 not exists, it's value is base_path (NOT recommended) -# the paths must be exist +# the paths must be exist. # # IMPORTANT NOTE: # the store paths' order is very important, don't mess up!!! diff --git a/conf/tracker.conf b/conf/tracker.conf index c06fcaf..a92e0aa 100644 --- a/conf/tracker.conf +++ b/conf/tracker.conf @@ -28,24 +28,25 @@ base_path = /home/yuqing/fastdfs max_connections = 1024 # accept thread count -# default value is 1 +# default value is 1 which is recommended # since V4.07 accept_threads = 1 # work thread count +# work threads to deal network io # default value is 4 # since V2.00 work_threads = 4 -# min buff size +# the min network buff size # default value 8KB min_buff_size = 8KB -# max buff size +# the max network buff size # default value 128KB max_buff_size = 128KB -# the method of selecting group to upload files +# the method for selecting group to upload files # 0: round robin # 1: specify group # 2: load balance, select the max free space group to upload file @@ -62,7 +63,7 @@ store_group = group2 # Note: if use_trunk_file set to true, must set store_server to 1 or 2 store_server = 0 -# which path(means disk or mount point) of the storage server to upload file +# which path (means disk or mount point) of the storage server to upload file # 0: round robin # 2: load balance, select the max free space path to upload file store_path = 0 @@ -74,14 +75,13 @@ download_server = 0 # reserved storage space for system or other applications. # if the free(available) space of any stoarge server in -# a group <= reserved_storage_space, -# no file can be uploaded to this group. +# a group <= reserved_storage_space, no file can be uploaded to this group. # bytes unit can be one of follows: ### G or g for gigabyte(GB) ### M or m for megabyte(MB) ### K or k for kilobyte(KB) ### no unit for byte(B) -### XX.XX% as ratio such as reserved_storage_space = 10% +### XX.XX% as ratio such as: reserved_storage_space = 10% reserved_storage_space = 20% #standard log level as syslog, case insensitive, value list: @@ -152,7 +152,7 @@ slot_min_size = 256 # store the upload file to trunk file when it's size <= this value # default value is 16MB # since V3.00 -slot_max_size = 16MB +slot_max_size = 4MB # the trunk file size, should >= 4MB # default value is 64MB @@ -176,8 +176,8 @@ trunk_create_file_time_base = 02:00 trunk_create_file_interval = 86400 # the threshold to create trunk file -# when the free trunk file size less than the threshold, will create -# the trunk files +# when the free trunk file size less than the threshold, +# will create he trunk files # default value is 0 # since V3.06 trunk_create_file_space_threshold = 20G @@ -202,13 +202,12 @@ trunk_init_reload_from_binlog = false # recommand to set this parameter to 86400 (one day) # default value is 0, 0 means never compress # since V5.01 -trunk_compress_binlog_min_interval = 0 +trunk_compress_binlog_min_interval = 86400 # if use storage server ID instead of IP address # if you want to use dual IPs for storage server, you MUST set # this parameter to true, and configure the dual IPs in the file -# configured by following item "storage_ids_filename", -# such as storage_ids.conf +# configured by following item "storage_ids_filename", such as storage_ids.conf # default value is false # since V4.00 use_storage_id = false diff --git a/storage/fdfs_storaged.c b/storage/fdfs_storaged.c index 1e69752..69326c8 100644 --- a/storage/fdfs_storaged.c +++ b/storage/fdfs_storaged.c @@ -301,7 +301,7 @@ int main(int argc, char *argv[]) */ usleep(10000); - if (++wait_count > 6000) + if (++wait_count > 9000) { logWarning("waiting timeout, exit!"); break;