diff --git a/conf/client.conf b/conf/client.conf index c1173ec..cdb84c8 100644 --- a/conf/client.conf +++ b/conf/client.conf @@ -1,13 +1,14 @@ # connect timeout in seconds # default value is 30s -connect_timeout=10 +# Note: in the intranet network (LAN), 2 seconds is enough. +connect_timeout = 5 # network timeout in seconds # default value is 30s -network_timeout=60 +network_timeout = 60 # the base path to store log files -base_path=/home/yuqing/fastdfs +base_path = /home/yuqing/fastdfs # tracker_server can ocur more than once for multi tracker servers. # the value format of tracker_server is "HOST:PORT", @@ -18,8 +19,8 @@ base_path=/home/yuqing/fastdfs # for example: 192.168.2.100,122.244.141.46:22122 # another eg.: 192.168.1.10,172.17.4.21:22122 -tracker_server=192.168.0.196:22122 -tracker_server=192.168.0.197:22122 +tracker_server = 192.168.0.196:22122 +tracker_server = 192.168.0.197:22122 #standard log level as syslog, case insensitive, value list: ### emerg for emergency @@ -30,7 +31,7 @@ tracker_server=192.168.0.197:22122 ### notice ### info ### debug -log_level=info +log_level = info # if use connection pool # default value is false @@ -46,7 +47,7 @@ connection_pool_max_idle_time = 3600 # if load FastDFS parameters from tracker server # since V4.05 # default value is false -load_fdfs_parameters_from_tracker=false +load_fdfs_parameters_from_tracker = false # if use storage ID instead of IP address # same as tracker.conf @@ -63,7 +64,7 @@ storage_ids_filename = storage_ids.conf #HTTP settings -http.tracker_server_port=80 +http.tracker_server_port = 80 #use "#include" directive to include HTTP other settiongs ##include http.conf diff --git a/conf/http.conf b/conf/http.conf index 4d055f9..26603dd 100644 --- a/conf/http.conf +++ b/conf/http.conf @@ -5,24 +5,24 @@ http.default_content_type = application/octet-stream # MIME types file format: MIME_type extensions # such as: image/jpeg jpeg jpg jpe # you can use apache's MIME file: mime.types -http.mime_types_filename=mime.types +http.mime_types_filename = mime.types # if use token to anti-steal # default value is false (0) -http.anti_steal.check_token=false +http.anti_steal.check_token = false # token TTL (time to live), seconds # default value is 600 -http.anti_steal.token_ttl=900 +http.anti_steal.token_ttl = 900 # secret key to generate anti-steal token # this parameter must be set when http.anti_steal.check_token set to true # the length of the secret key should not exceed 128 bytes -http.anti_steal.secret_key=FastDFS1234567890 +http.anti_steal.secret_key = FastDFS1234567890 # return the content of the file when check token fail # default value is empty (no file sepecified) -http.anti_steal.token_check_fail=/home/yuqing/fastdfs/conf/anti-steal.jpg +http.anti_steal.token_check_fail = /home/yuqing/fastdfs/conf/anti-steal.jpg # if support multi regions for HTTP Range # default value is true diff --git a/conf/storage.conf b/conf/storage.conf index c27059f..1d864eb 100644 --- a/conf/storage.conf +++ b/conf/storage.conf @@ -1,56 +1,57 @@ # is this config file disabled # false for enabled # true for disabled -disabled=false +disabled = false # the name of the group this storage server belongs to # # comment or remove this item for fetching from tracker server, # in this case, use_storage_id must set to true in tracker.conf, # and storage_ids.conf must be configured correctly. -group_name=group1 +group_name = group1 # bind an address of this host # empty for bind all addresses of this host -bind_addr= +bind_addr = # if bind an address of this host when connect to other servers # (this storage server as a client) # true for binding the address configured by the above parameter: "bind_addr" # false for binding any address of this host -client_bind=true +client_bind = true # the storage server port -port=23000 +port = 23000 # connect timeout in seconds # default value is 30 # Note: in the intranet network (LAN), 2 seconds is enough. -connect_timeout=10 +connect_timeout = 5 # network timeout in seconds for send and recv # default value is 30 -network_timeout=60 +network_timeout = 60 # 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 # 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 # NOTE: the binlog files maybe are large, make sure -# the base path has enough disk space -base_path=/home/yuqing/fastdfs +# the base path has enough disk space, +# eg. the disk free space should > 50GB +base_path = /home/yuqing/fastdfs # max concurrent connections the server supported # 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 # this parameter must more than 8KB @@ -62,13 +63,13 @@ buff_size = 256KB # accept thread count # default value is 1 # since V4.07 -accept_threads=1 +accept_threads = 1 # work thread count # work thread deal network io # default value is 4 # since V2.00 -work_threads=4 +work_threads = 4 # if disk read / write separated ## false for mixed read and write @@ -91,23 +92,23 @@ disk_writer_threads = 1 # when no entry to sync, try read binlog again after X milliseconds # must > 0, default value is 200ms -sync_wait_msec=50 +sync_wait_msec = 50 # after sync a file, usleep milliseconds # 0 for sync successively (never call usleep) -sync_interval=0 +sync_interval = 0 # storage sync start time of a day, time format: Hour:Minute # Hour from 0 to 23, Minute from 0 to 59 -sync_start_time=00:00 +sync_start_time = 00:00 # storage sync end time of a day, time format: Hour:Minute # Hour from 0 to 23, Minute from 0 to 59 -sync_end_time=23:59 +sync_end_time = 23:59 # write to the mark file after sync N files # default value is 500 -write_mark_file_freq=500 +write_mark_file_freq = 500 # disk recovery thread count # default value is 1 @@ -117,7 +118,7 @@ disk_recovery_threads = 1 # 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 file +# 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 # @@ -125,12 +126,12 @@ store_path_count = 1 # the store paths' order is very important, don't mess up!!! # the base_path should be independent (different) of the store paths -store_path0=/home/yuqing/fastdfs -#store_path1=/home/yuqing/fastdfs2 +store_path0 = /home/yuqing/fastdfs +#store_path1 = /home/yuqing/fastdfs2 # subdir_count * subdir_count directories will be auto created under each # store_path (disk), value can be 1 to 256, default value is 256 -subdir_count_per_path=256 +subdir_count_per_path = 256 # tracker_server can ocur more than once for multi tracker servers. # the value format of tracker_server is "HOST:PORT", @@ -141,8 +142,8 @@ subdir_count_per_path=256 # for example: 192.168.2.100,122.244.141.46:22122 # another eg.: 192.168.1.10,172.17.4.21:22122 -tracker_server=192.168.209.121:22122 -tracker_server=192.168.209.122:22122 +tracker_server = 192.168.209.121:22122 +tracker_server = 192.168.209.122:22122 #standard log level as syslog, case insensitive, value list: ### emerg for emergency @@ -153,15 +154,15 @@ tracker_server=192.168.209.122:22122 ### notice ### info ### debug -log_level=info +log_level = info #unix group name to run this program, #not set (empty) means run by the group of current user -run_by_group= +run_by_group = #unix username to run this program, #not set (empty) means run by current user -run_by_user= +run_by_user = # allow_hosts can ocur more than once, host can be hostname or ip address, # "*" (only one asterisk) means match all ip addresses @@ -171,71 +172,71 @@ run_by_user= # allow_hosts=10.0.1.[1-15,20] # allow_hosts=host[01-08,20-25].domain.com # allow_hosts=192.168.5.64/26 -allow_hosts=* +allow_hosts = * # the mode of the files distributed to the data path # 0: round robin(default) # 1: random, distributted by hash code -file_distribute_path_mode=0 +file_distribute_path_mode = 0 # valid when file_distribute_to_path is set to 0 (round robin). # when the written file count reaches this number, then rotate to next path. # rotate to the first path (00/00) after the last path (such as FF/FF). # default value is 100 -file_distribute_rotate_count=100 +file_distribute_rotate_count = 100 # call fsync to disk when write big file # 0: never call fsync # other: call fsync when written bytes >= this bytes # default value is 0 (never call fsync) -fsync_after_written_bytes=0 +fsync_after_written_bytes = 0 # sync log buff to disk every interval seconds # must > 0, default value is 10 seconds -sync_log_buff_interval=1 +sync_log_buff_interval = 1 # sync binlog buff / cache to disk every interval seconds # default value is 60 seconds -sync_binlog_buff_interval=1 +sync_binlog_buff_interval = 1 # sync storage stat info to disk every interval seconds # default value is 300 seconds -sync_stat_file_interval=300 +sync_stat_file_interval = 300 # thread stack size, should >= 512KB # default value is 512KB -thread_stack_size=512KB +thread_stack_size = 512KB # the priority as a source server for uploading file. # the lower this value, the higher its uploading priority. # default value is 10 -upload_priority=10 +upload_priority = 10 # the NIC alias prefix, such as eth in Linux, you can see it by ifconfig -a # multi aliases split by comma. empty value means auto set by OS type # default values is empty -if_alias_prefix= +if_alias_prefix = # if check file duplicate, when set to true, use FastDHT to store file indexes # 1 or yes: need check # 0 or no: do not check # default value is 0 -check_file_duplicate=0 +check_file_duplicate = 0 # file signature method for check file duplicate ## hash: four 32 bits hash code ## md5: MD5 signature # default value is hash # since V4.01 -file_signature_method=hash +file_signature_method = hash # namespace for storing file indexes (key-value pairs) # this item must be set when check_file_duplicate is true / on -key_namespace=FastDFS +key_namespace = FastDFS # set keep_alive to 1 to enable persistent connection with FastDHT servers # default value is 0 (short connection) -keep_alive=0 +keep_alive = 0 # you can use "#include filename" (not include double quotes) directive to # load FastDHT server list, when the filename is a relative path such as @@ -258,7 +259,7 @@ rotate_access_log = false # Hour from 0 to 23, Minute from 0 to 59 # default value is 00:00 # since V4.00 -access_log_rotate_time=00:00 +access_log_rotate_time = 00:00 # if compress the old access log by gzip # default value is false @@ -268,7 +269,7 @@ compress_old_access_log = false # compress the access log days before # default value is 1 # since V6.04 -compress_access_log_days_before = 1 +compress_access_log_days_before = 7 # if rotate the error log every day # default value is false @@ -279,7 +280,7 @@ rotate_error_log = false # Hour from 0 to 23, Minute from 0 to 59 # default value is 00:00 # since V4.02 -error_log_rotate_time=00:00 +error_log_rotate_time = 00:00 # if compress the old error log by gzip # default value is false @@ -289,7 +290,7 @@ compress_old_error_log = false # compress the error log days before # default value is 1 # since V6.04 -compress_error_log_days_before = 1 +compress_error_log_days_before = 7 # rotate access log when the log file exceeds this size # 0 means never rotates log file by log file size @@ -311,7 +312,7 @@ log_file_keep_days = 0 # if skip the invalid record when sync file # default value is false # since V4.02 -file_sync_skip_invalid_record=false +file_sync_skip_invalid_record = false # if use connection pool # default value is false @@ -333,7 +334,7 @@ compress_binlog = true # Hour from 0 to 23, Minute from 0 to 59 # default value is 01:30 # since V6.01 -compress_binlog_time=01:30 +compress_binlog_time = 01:30 # if check the mark of store path to prevent confusion # recommend to set this parameter to true @@ -345,8 +346,8 @@ check_store_path_mark = true # use the ip address of this storage server if domain_name is empty, # else this domain name will ocur in the url redirected by the tracker server -http.domain_name= +http.domain_name = # the port of the web server on this storage server -http.server_port=8888 +http.server_port = 8888 diff --git a/conf/storage_ids.conf b/conf/storage_ids.conf index 1075a43..8f6911f 100644 --- a/conf/storage_ids.conf +++ b/conf/storage_ids.conf @@ -1,4 +1,8 @@ # +# +# id is a natural number (1, 2, 3 etc.), +# 6 bits of the id length is enough, such as 100001 +# # storage ip or hostname can be dual IPs seperated by comma, # one is an inner (intranet) IP and another is an outer (extranet) IP, # or two different types of inner (intranet) IPs @@ -8,5 +12,5 @@ # the port is optional. if you run more than one storaged instances # in a server, you must specified the port to distinguish different instances. -# 100001 group1 192.168.0.196 -# 100002 group1 192.168.0.116 +100001 group1 192.168.0.196 +100002 group1 192.168.0.197 diff --git a/conf/tracker.conf b/conf/tracker.conf index f93b6c0..c06fcaf 100644 --- a/conf/tracker.conf +++ b/conf/tracker.conf @@ -1,41 +1,41 @@ # is this config file disabled # false for enabled # true for disabled -disabled=false +disabled = false # bind an address of this host # empty for bind all addresses of this host -bind_addr= +bind_addr = # the tracker server port -port=22122 +port = 22122 # connect timeout in seconds # default value is 30 # Note: in the intranet network (LAN), 2 seconds is enough. -connect_timeout=10 +connect_timeout = 5 # network timeout in seconds for send and recv # default value is 30 -network_timeout=60 +network_timeout = 60 # the base path to store data and log files -base_path=/home/yuqing/fastdfs +base_path = /home/yuqing/fastdfs # max concurrent connections this server support # you should set this parameter larger, eg. 10240 # default value is 256 -max_connections=1024 +max_connections = 1024 # accept thread count # default value is 1 # since V4.07 -accept_threads=1 +accept_threads = 1 -# work thread count, should <= max_connections +# work thread count # default value is 4 # since V2.00 -work_threads=4 +work_threads = 4 # min buff size # default value 8KB @@ -49,28 +49,28 @@ max_buff_size = 128KB # 0: round robin # 1: specify group # 2: load balance, select the max free space group to upload file -store_lookup=2 +store_lookup = 2 # which group to upload file # when store_lookup set to 1, must set store_group to the group name -store_group=group2 +store_group = group2 # which storage server to upload file # 0: round robin (default) # 1: the first server order by ip address # 2: the first server order by priority (the minimal) # Note: if use_trunk_file set to true, must set store_server to 1 or 2 -store_server=0 +store_server = 0 # 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 +store_path = 0 # which storage server to download file # 0: round robin (default) # 1: the source storage server which the current file uploaded to -download_server=0 +download_server = 0 # reserved storage space for system or other applications. # if the free(available) space of any stoarge server in @@ -93,7 +93,7 @@ reserved_storage_space = 20% ### notice ### info ### debug -log_level=info +log_level = info #unix group name to run this program, #not set (empty) means run by the group of current user @@ -101,7 +101,7 @@ run_by_group= #unix username to run this program, #not set (empty) means run by current user -run_by_user= +run_by_user = # allow_hosts can ocur more than once, host can be hostname or ip address, # "*" (only one asterisk) means match all ip addresses @@ -111,7 +111,7 @@ run_by_user= # allow_hosts=10.0.1.[1-15,20] # allow_hosts=host[01-08,20-25].domain.com # allow_hosts=192.168.5.64/26 -allow_hosts=* +allow_hosts = * # sync log buff to disk every interval seconds # default value is 10 seconds @@ -250,7 +250,7 @@ compress_old_error_log = false # compress the error log days before # default value is 1 # since V6.04 -compress_error_log_days_before = 1 +compress_error_log_days_before = 7 # rotate error log when the log file exceeds this size # 0 means never rotates log file by log file size @@ -275,21 +275,21 @@ use_connection_pool = true connection_pool_max_idle_time = 3600 # HTTP port on this tracker server -http.server_port=8080 +http.server_port = 8080 # check storage HTTP server alive interval seconds # <= 0 for never check # default value is 30 -http.check_alive_interval=30 +http.check_alive_interval = 30 # check storage HTTP server alive type, values are: # tcp : connect to the storge server with HTTP port only, # do not request and get response # http: storage check alive url must return http status 200 # default value is tcp -http.check_alive_type=tcp +http.check_alive_type = tcp # check storage HTTP server alive uri/url # NOTE: storage embed HTTP server support uri: /status.html -http.check_alive_uri=/status.html +http.check_alive_uri = /status.html