diff --git a/HISTORY b/HISTORY index a22fd10..16d8cef 100644 --- a/HISTORY +++ b/HISTORY @@ -1,5 +1,5 @@ -Version 6.03 2019-11-17 +Version 6.03 2019-11-19 * dual IPs support two different types of inner (intranet) IPs * storage server request tracker server to change it's status to that of tracker leader when the storage server found diff --git a/conf/storage.conf b/conf/storage.conf index 9346182..0a3b599 100644 --- a/conf/storage.conf +++ b/conf/storage.conf @@ -303,6 +303,14 @@ compress_binlog = false # since V6.01 compress_binlog_time=01:30 +# if check the mark of store path to prevent confusion +# recommend to set this parameter to true +# if two storage servers (instances) MUST use a same store path for +# some specific purposes, you should set this parameter to false +# default value is true +# since V6.03 +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= diff --git a/storage/storage_func.c b/storage/storage_func.c index acd369e..0823442 100644 --- a/storage/storage_func.c +++ b/storage/storage_func.c @@ -671,13 +671,16 @@ int storage_write_to_sync_ini_file() ); - for (i=0; i