test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-03 20:39:36 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge branch 'branch-0.3.1' into 'branch-0.3.1'

Browse Source 
MS-328 Check metric type on server start

See merge request megasearch/milvus!316

Former-commit-id: 3b10a3116bb6a2da73f5eb6b0cb353a4e154c5f2
This commit is contained in:
jinhai 2019-08-08 14:30:56 +08:00
commit e65c20844f
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/CHANGELOG.md
View File

@ -44,6 +44,7 @@ Please mark all change in change log and use the ticket from JIRA.
- MS-305 - Add CPU core percent metric - MS-305 - Add CPU core percent metric
- MS-310 - Add milvus CPU utilization ratio and CPU/GPU temperature metrics - MS-310 - Add milvus CPU utilization ratio and CPU/GPU temperature metrics
- MS-324 - Show error when there is not enough gpu memory to build index - MS-324 - Show error when there is not enough gpu memory to build index
- MS-328 - Check metric type on server start
## New Feature ## New Feature
- MS-180 - Add new mem manager - MS-180 - Add new mem manager

7
cpp/src/server/DBWrapper.cpp
View File

@ -74,6 +74,12 @@ DBWrapper::DBWrapper() {
} }
} }
std::string metric_type = engine_config.GetValue(CONFIG_METRICTYPE, "L2");
if(metric_type != "L2" && metric_type != "IP") {
std::cout << "ERROR! Illegal metric type: " << metric_type << ", available options: L2 or IP" << std::endl;
kill(0, SIGUSR1);
}
//set archive config //set archive config
engine::ArchiveConf::CriteriaT criterial; engine::ArchiveConf::CriteriaT criterial;
int64_t disk = db_config.GetInt64Value(CONFIG_DB_ARCHIVE_DISK, 0); int64_t disk = db_config.GetInt64Value(CONFIG_DB_ARCHIVE_DISK, 0);
@ -101,6 +107,7 @@ DBWrapper::DBWrapper() {
} }
} }
//create db instance
std::string msg = opt.meta.path; std::string msg = opt.meta.path;
try { try {
zilliz::milvus::engine::DB::Open(opt, &db_); zilliz::milvus::engine::DB::Open(opt, &db_);