Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
milvus
提交
2c04cc0a
milvus
项目概览
BaiXuePrincess
/
milvus
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
4
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
milvus
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
2c04cc0a
编写于
5月 09, 2020
作者:
W
Wang XiangYu
提交者:
GitHub
5月 09, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
upgrade config to 0.4 (#2273)
Signed-off-by:
N
wxyu
<
xy.wang@zilliz.com
>
上级
7f744c03
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
67 addition
and
63 deletion
+67
-63
core/CMakeLists.txt
core/CMakeLists.txt
+0
-3
core/conf/demo/log_config.conf
core/conf/demo/log_config.conf
+0
-27
core/conf/demo/server_config.yaml
core/conf/demo/server_config.yaml
+41
-1
core/conf/log_config.template
core/conf/log_config.template
+0
-30
core/conf/server_config.template
core/conf/server_config.template
+25
-1
core/src/config/Config.cpp
core/src/config/Config.cpp
+1
-1
未找到文件。
core/CMakeLists.txt
浏览文件 @
2c04cc0a
...
...
@@ -217,8 +217,6 @@ else ()
@ONLY
)
endif
()
configure_file
(
${
CMAKE_CURRENT_SOURCE_DIR
}
/conf/log_config.template
${
CMAKE_CURRENT_SOURCE_DIR
}
/conf/log_config.conf
)
install
(
DIRECTORY scripts/
DESTINATION scripts
FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
...
...
@@ -232,7 +230,6 @@ install(DIRECTORY scripts/migration
WORLD_EXECUTE WORLD_READ
)
install
(
FILES
conf/server_config.yaml
conf/log_config.conf
DESTINATION
conf
)
...
...
core/conf/demo/log_config.conf
已删除
100644 → 0
浏览文件 @
7f744c03
*
GLOBAL
:
FORMAT
=
"%datetime | %level | %logger | %msg"
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-global.log"
ENABLED
=
true
TO_FILE
=
true
TO_STANDARD_OUTPUT
=
false
SUBSECOND_PRECISION
=
3
PERFORMANCE_TRACKING
=
false
MAX_LOG_FILE_SIZE
=
209715200
## Throw log files away after 200MB
*
DEBUG
:
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-debug.log"
ENABLED
=
true
*
WARNING
:
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-warning.log"
*
TRACE
:
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-trace.log"
*
VERBOSE
:
FORMAT
=
"%datetime{%d/%M/%y} | %level-%vlevel | %msg"
TO_FILE
=
false
TO_STANDARD_OUTPUT
=
false
## Error logs
*
ERROR
:
ENABLED
=
true
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-error.log"
*
FATAL
:
ENABLED
=
true
FILENAME
=
"/var/lib/milvus/logs/milvus-%datetime{%y-%M-%d-%H:%m}-fatal.log"
core/conf/demo/server_config.yaml
浏览文件 @
2c04cc0a
...
...
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
version
:
0.
3
version
:
0.
4
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
...
...
@@ -68,9 +68,13 @@ db_config:
# secondary_path | A semicolon-separated list of secondary directories used | Path | |
# | to save vector data and index data. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
# file_cleanup_timeout | time gap between soft-delete and hard-delete | Integer | 10 (s) |
# | range [0, 3600] | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
storage_config
:
primary_path
:
/var/lib/milvus
secondary_path
:
file_cleanup_timeout
:
10
#----------------------+------------------------------------------------------------+------------+-----------------+
# Metric Config | Description | Type | Default |
...
...
@@ -186,3 +190,39 @@ wal_config:
recovery_error_ignore
:
true
buffer_size
:
256
wal_path
:
/var/lib/milvus/wal
#----------------------+------------------------------------------------------------+------------+-----------------+
# Logs | Description | Type | Default |
#----------------------+------------------------------------------------------------+------------+-----------------+
# trace.enable | Whether to enable trace level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# debug.enable | Whether to enable debug level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# info.enable | Whether to enable info level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# warning.enable | Whether to enable warning level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# error.enable | Whether to enable error level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# fatal.enable | Whether to enable fatal level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# path | Location of logs files. | String | |
#----------------------+------------------------------------------------------------+------------+-----------------+
# max_log_file_size | Max size of a single log file. After exceeding this value, | Integer | 256 (MB) |
# | rename this file to xxx.log.n, means the nth file. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
# delete_exceeds | Milvus will keep up to ${delete_exceeds} log files per | Integer | 10 |
# | level. For example, after xxx.log.11 file is generated, | | |
# | the xxx.log.1 file will be deleted. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
logs
:
trace.enable
:
true
debug.enable
:
true
info.enable
:
true
warning.enable
:
true
error.enable
:
true
fatal.enable
:
true
path
:
/var/lib/milvus/logs
max_log_file_size
:
256
delete_exceeds
:
10
core/conf/log_config.template
已删除
100644 → 0
浏览文件 @
7f744c03
* GLOBAL:
FORMAT = "[%datetime][%level]%msg"
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-global.log"
ENABLED = true
TO_FILE = true
TO_STANDARD_OUTPUT = false
SUBSECOND_PRECISION = 3
PERFORMANCE_TRACKING = false
MAX_LOG_FILE_SIZE = 209715200 ## Throw log files away after 200MB
* INFO:
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-info.log"
ENABLED = true
* DEBUG:
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-debug.log"
ENABLED = true
* WARNING:
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-warning.log"
* TRACE:
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-trace.log"
* VERBOSE:
FORMAT = "%datetime{%d/%M/%y} | %level-%vlevel | %msg"
TO_FILE = false
TO_STANDARD_OUTPUT = false
## Error logs
* ERROR:
ENABLED = true
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-error.log"
* FATAL:
ENABLED = true
FILENAME = "@MILVUS_DB_PATH@/logs/milvus-%datetime{%y-%M-%d-%H:%m}-fatal.log"
core/conf/server_config.template
浏览文件 @
2c04cc0a
...
...
@@ -9,7 +9,7 @@
# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
# or implied. See the License for the specific language governing permissions and limitations under the License.
version: 0.
3
version: 0.
4
#----------------------+------------------------------------------------------------+------------+-----------------+
# Server Config | Description | Type | Default |
...
...
@@ -191,6 +191,30 @@ wal_config:
buffer_size: 256
wal_path: @MILVUS_DB_PATH@/wal
#----------------------+------------------------------------------------------------+------------+-----------------+
# Logs | Description | Type | Default |
#----------------------+------------------------------------------------------------+------------+-----------------+
# trace.enable | Whether to enable trace level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# debug.enable | Whether to enable debug level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# info.enable | Whether to enable info level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# warning.enable | Whether to enable warning level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# error.enable | Whether to enable error level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# fatal.enable | Whether to enable fatal level logging in Milvus. | Boolean | true |
#----------------------+------------------------------------------------------------+------------+-----------------+
# path | Location of logs files. | String | |
#----------------------+------------------------------------------------------------+------------+-----------------+
# max_log_file_size | Max size of a single log file. After exceeding this value, | Integer | 256 (MB) |
# | rename this file to xxx.log.n, means the nth file. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
# delete_exceeds | Milvus will keep up to ${delete_exceeds} log files per | Integer | 10 |
# | level. For example, after xxx.log.11 file is generated, | | |
# | the xxx.log.1 file will be deleted. | | |
#----------------------+------------------------------------------------------------+------------+-----------------+
logs:
trace.enable: true
debug.enable: true
...
...
core/src/config/Config.cpp
浏览文件 @
2c04cc0a
...
...
@@ -185,7 +185,7 @@ constexpr int32_t PORT_NUMBER_MIN = 1024;
constexpr
int32_t
PORT_NUMBER_MAX
=
65535
;
static
const
std
::
unordered_map
<
std
::
string
,
std
::
string
>
milvus_config_version_map
(
{{
"0.6.0"
,
"0.1"
},
{
"0.7.0"
,
"0.2"
},
{
"0.7.1"
,
"0.2"
},
{
"0.8.0"
,
"0.3"
}});
{{
"0.6.0"
,
"0.1"
},
{
"0.7.0"
,
"0.2"
},
{
"0.7.1"
,
"0.2"
},
{
"0.8.0"
,
"0.3"
}
,
{
"0.9.0"
,
"0.4"
}
});
/////////////////////////////////////////////////////////////
Config
::
Config
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录