test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-03 04:19:18 +08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

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

Browse Source 
MS-249 Check machine hardware during initialize

See merge request megasearch/milvus!261

Former-commit-id: 7440c8926d02d6a6eb6f574800cbe942fcffb65b
This commit is contained in:
peng.xu 2019-07-22 15:34:17 +08:00
commit a8707a5313
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpp/src/server/ServerConfig.cpp
View File

@ -61,7 +61,7 @@ ServerConfig::LoadConfigFile(const std::string& config_filename) {
ServerError ServerConfig::ValidateConfig() const { ServerError ServerConfig::ValidateConfig() const {
//server config validation //server config validation
ConfigNode server_config = GetConfig(CONFIG_SERVER); ConfigNode server_config = GetConfig(CONFIG_SERVER);
uint32_t gpu_index = (uint32_t)server_config.GetInt32Value(CONFIG_GPU_INDEX); uint32_t gpu_index = (uint32_t)server_config.GetInt32Value(CONFIG_GPU_INDEX, 0);
if(ValidationUtil::ValidateGpuIndex(gpu_index) != SERVER_SUCCESS) { if(ValidationUtil::ValidateGpuIndex(gpu_index) != SERVER_SUCCESS) {
std::cout << "Error: invalid gpu_index " << std::to_string(gpu_index) << std::endl; std::cout << "Error: invalid gpu_index " << std::to_string(gpu_index) << std::endl;
return SERVER_INVALID_ARGUMENT; return SERVER_INVALID_ARGUMENT;
@ -72,14 +72,14 @@ ServerError ServerConfig::ValidateConfig() const {
CommonUtil::GetSystemMemInfo(total_mem, free_mem); CommonUtil::GetSystemMemInfo(total_mem, free_mem);
ConfigNode db_config = GetConfig(CONFIG_DB); ConfigNode db_config = GetConfig(CONFIG_DB);
uint64_t insert_buffer_size = (uint64_t)db_config.GetInt32Value(CONFIG_DB_INSERT_BUFFER_SIZE); uint64_t insert_buffer_size = (uint64_t)db_config.GetInt32Value(CONFIG_DB_INSERT_BUFFER_SIZE, 4);
insert_buffer_size *= GB; insert_buffer_size *= GB;
if(insert_buffer_size >= total_mem) { if(insert_buffer_size >= total_mem) {
std::cout << "Error: insert_buffer_size execeed system memory" << std::endl; std::cout << "Error: insert_buffer_size execeed system memory" << std::endl;
return SERVER_INVALID_ARGUMENT; return SERVER_INVALID_ARGUMENT;
} }
uint64_t index_building_threshold = (uint64_t)db_config.GetInt32Value(CONFIG_DB_INDEX_TRIGGER_SIZE); uint64_t index_building_threshold = (uint64_t)db_config.GetInt32Value(CONFIG_DB_INDEX_TRIGGER_SIZE, 1024);
index_building_threshold *= MB; index_building_threshold *= MB;
size_t gpu_mem = 0; size_t gpu_mem = 0;
@ -94,7 +94,7 @@ ServerError ServerConfig::ValidateConfig() const {
//cache config validation //cache config validation
ConfigNode cache_config = GetConfig(CONFIG_CACHE); ConfigNode cache_config = GetConfig(CONFIG_CACHE);
uint64_t cache_cap = (uint64_t)cache_config.GetInt64Value(CONFIG_CPU_CACHE_CAPACITY); uint64_t cache_cap = (uint64_t)cache_config.GetInt64Value(CONFIG_CPU_CACHE_CAPACITY, 16);
cache_cap *= GB; cache_cap *= GB;
if(cache_cap >= total_mem) { if(cache_cap >= total_mem) {
std::cout << "Error: cpu_cache_capacity execeed system memory" << std::endl; std::cout << "Error: cpu_cache_capacity execeed system memory" << std::endl;
@ -108,7 +108,7 @@ ServerError ServerConfig::ValidateConfig() const {
return SERVER_INVALID_ARGUMENT; return SERVER_INVALID_ARGUMENT;
} }
double free_percent = cache_config.GetDoubleValue(server::CACHE_FREE_PERCENT); double free_percent = cache_config.GetDoubleValue(server::CACHE_FREE_PERCENT, 0.85);
if(free_percent < std::numeric_limits<double>::epsilon() || free_percent > 1.0) { if(free_percent < std::numeric_limits<double>::epsilon() || free_percent > 1.0) {
std::cout << "Error: invalid cache_free_percent " << std::to_string(free_percent) << std::endl; std::cout << "Error: invalid cache_free_percent " << std::to_string(free_percent) << std::endl;
return SERVER_INVALID_ARGUMENT; return SERVER_INVALID_ARGUMENT;