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

change store_server when use_trunk_file is true

pull/56/merge
yuqing 2017-03-29 09:55:10 +08:00
parent f76d24b52d
commit 90e94f4957
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/tracker.conf
View File

@ -56,7 +56,8 @@ store_group=group2
# 0: round robin (default) # 0: round robin (default)
# 1: the first server order by ip address # 1: the first server order by ip address
# 2: the first server order by priority (the minimal) # 2: the first server order by priority (the minimal)
store_server=1 # 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 # 0: round robin

8
tracker/tracker_func.c
View File

@ -695,6 +695,14 @@ int tracker_load_from_conf_file(const char *filename, \
#endif #endif
if (g_if_use_trunk_file && g_groups.store_server == FDFS_STORE_SERVER_ROUND_ROBIN)
{
logInfo("file: "__FILE__", line: %d, "
"set store_server to %d because use_trunk_file is true",
__LINE__, FDFS_STORE_SERVER_FIRST_BY_IP);
g_groups.store_server = FDFS_STORE_SERVER_FIRST_BY_IP;
}
logInfo("FastDFS v%d.%02d, base_path=%s, " \ logInfo("FastDFS v%d.%02d, base_path=%s, " \
"run_by_group=%s, run_by_user=%s, " \ "run_by_group=%s, run_by_user=%s, " \
"connect_timeout=%ds, " \ "connect_timeout=%ds, " \