From 132dbc095082026c89c22d1b321d02f87d37d8b7 Mon Sep 17 00:00:00 2001
From: YuQing <384681@qq.com>
Date: Mon, 18 Nov 2019 08:36:51 +0800
Subject: [PATCH] change comments in the config files

---
 conf/storage.conf      | 26 ++++++++++++++++----------
 conf/tracker.conf      | 12 +++++++++---
 storage/storage_func.c |  7 ++++++-
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/conf/storage.conf b/conf/storage.conf
index 31fb080..9346182 100644
--- a/conf/storage.conf
+++ b/conf/storage.conf
@@ -7,7 +7,7 @@ disabled=false
 #
 # 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 configed correctly.
+# and storage_ids.conf must be configured correctly.
 group_name=group1
 
 # bind an address of this host
@@ -16,7 +16,7 @@ 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 configed by above parameter: "bind_addr"
+# true for binding the address configured by the above parameter: "bind_addr"
 # false for binding any address of this host
 client_bind=true
 
@@ -25,9 +25,10 @@ port=23000
 
 # connect timeout in seconds
 # default value is 30s
+# Note: in the intranet network (LAN), 2 seconds is enough.
 connect_timeout=10
 
-# network timeout in seconds
+# network timeout in seconds for send and recv
 # default value is 30s
 network_timeout=60
 
@@ -46,7 +47,7 @@ base_path=/home/yuqing/fastdfs
 # you should set this parameter larger, eg. 10240
 max_connections=1024
 
-# the buff size to recv / send data
+# the buff size to recv / send data from/to network
 # this parameter must more than 8KB
 # default value is 64KB
 # since V2.00
@@ -57,7 +58,7 @@ buff_size = 256KB
 # since V4.07
 accept_threads=1
 
-# work thread count, should <= max_connections
+# work thread count
 # work thread deal network io
 # default value is 4
 # since V2.00
@@ -70,13 +71,13 @@ work_threads=4
 # since V2.00
 disk_rw_separated = true
 
-# disk reader thread count per store base path
+# disk reader thread count per store path
 # for mixed read / write, this parameter can be 0
 # default value is 1
 # since V2.00
 disk_reader_threads = 1
 
-# disk writer thread count per store base path
+# disk writer thread count per store path
 # for mixed read / write, this parameter can be 0
 # default value is 1
 # since V2.00
@@ -102,12 +103,17 @@ sync_end_time=23:59
 # default value is 500
 write_mark_file_freq=500
 
-# path(disk or mount point) count, default value is 1
+# store path (disk or mount point) count, default value is 1
 store_path_count=1
 
-# store_path#, based 0, if store_path0 not exists, it's value is base_path
+# store_path#, based on 0, to configure the store paths to store file
+# if store_path0 not exists, it's value is base_path (NOT recommended)
 # the paths must be exist
-# NOTE: the store paths' order is very important, don't mess up.
+#
+# IMPORTANT NOTE:
+#       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
 
diff --git a/conf/tracker.conf b/conf/tracker.conf
index c2d645b..6c5f8c5 100644
--- a/conf/tracker.conf
+++ b/conf/tracker.conf
@@ -12,9 +12,10 @@ port=22122
 
 # connect timeout in seconds
 # default value is 30s
+# Note: in the intranet network (LAN), 2 seconds is enough.
 connect_timeout=10
 
-# network timeout in seconds
+# network timeout in seconds for send and recv
 # default value is 30s
 network_timeout=60
 
@@ -196,18 +197,23 @@ trunk_init_reload_from_binlog = false
 
 # the min interval for compressing the trunk binlog file
 # unit: second
-# default value is 0, 0 means never compress
 # FastDFS compress the trunk binlog when trunk init and trunk destroy
 # 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
 
-# if use storage ID instead of IP address
+# 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
 # default value is false
 # since V4.00
 use_storage_id = false
 
 # specify storage ids filename, can use relative or absolute path
+# this parameter is valid only when use_storage_id set to true
 # since V4.00
 storage_ids_filename = storage_ids.conf
 
diff --git a/storage/storage_func.c b/storage/storage_func.c
index c67bdf6..acd369e 100644
--- a/storage/storage_func.c
+++ b/storage/storage_func.c
@@ -877,7 +877,12 @@ static int storage_check_store_path_mark(const int store_path_index,
         if (mark != NULL)
         {
             if (strcmp(g_fdfs_store_paths.paths[store_path_index].mark,
-                        mark) != 0)
+                        mark) == 0)
+            {
+                free(mark);
+                return 0;
+            }
+            else
             {
                 FDFSStorePathMarkInfo mark_info;
                 int mark_len;