milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

print out system memory size when report invalid cpu cache size (#2679) 

Signed-off-by: yudong.cai <yudong.cai@zilliz.com>
pull/2666/head
Cai Yudong 2020-06-28 16:18:32 +08:00 committed by GitHub
parent ba26b677da
commit 18998a4395
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -27,6 +27,7 @@ Please mark all changes in change log and use the issue from GitHub
- \#2544 Optimize unittest build
- \#2561 Clean util dependencies with other modules
- \#2612 Move all APIs in utils into namespace milvus
- \#2675 Print out system memory size when report invalid cpu cache size
## Task

38
core/src/config/Config.cpp
View File

@ -17,6 +17,7 @@
#include <fstream>
#include <iostream>
#include <regex>
#include <sstream>
#include <string>
#include <thread>
#include <unordered_map>
@ -1172,30 +1173,32 @@ Config::CheckCacheConfigCpuCacheCapacity(const std::string& value) {
return Status(SERVER_INVALID_ARGUMENT, err);
} else {
if (cache_size <= 0) {
std::string msg = "Invalid cpu cache capacity: " + value +
". Possible reason: cache.cache_size is not a positive integer.";
std::string msg =
"Invalid cpu cache size: " + value + ". Possible reason: cache.cache_size is not a positive integer.";
return Status(SERVER_INVALID_ARGUMENT, msg);
}
int64_t total_mem = 0, free_mem = 0;
GetSystemMemInfo(total_mem, free_mem);
if (cache_size >= total_mem) {
std::string msg =
"Invalid cpu cache size: " + value + ". Possible reason: cache.cache_size exceeds system memory.";
return Status(SERVER_INVALID_ARGUMENT, msg);
std::stringstream ss;
ss << "Invalid cpu cache size: " << value << ". ";
ss << "Possible reason: cache.cache_size exceeds system memory (" << (total_mem >> 30) << "GB).";
return Status(SERVER_INVALID_ARGUMENT, ss.str());
} else if (static_cast<double>(cache_size) > static_cast<double>(total_mem * 0.9)) {
std::cerr << "WARNING: cpu cache size value is too big" << std::endl;
}
std::string str = GetConfigStr(CONFIG_CACHE, CONFIG_CACHE_INSERT_BUFFER_SIZE, "0");
std::string bs_str = GetConfigStr(CONFIG_CACHE, CONFIG_CACHE_INSERT_BUFFER_SIZE, "0");
int64_t insert_buffer_size = parse_bytes(bs_str, err);
int64_t insert_buffer_size = parse_bytes(str, err);
fiu_do_on("Config.CheckCacheConfigCpuCacheCapacity.large_insert_buffer", insert_buffer_size = total_mem + 1);
if (insert_buffer_size + cache_size >= total_mem) {
std::string msg = "Invalid cpu cache size: " + value +
". Possible reason: sum of cache.cache_size and "
"cache.insert_buffer_size exceeds system memory.";
return Status(SERVER_INVALID_ARGUMENT, msg);
std::stringstream ss;
ss << "Invalid cpu cache size: " << value << ". ";
ss << "Possible reason: sum of cache.cache_size and cache.insert_buffer_size (" << bs_str << ") ";
ss << "exceeds system memory (" << (total_mem >> 30) << "GB).";
return Status(SERVER_INVALID_ARGUMENT, ss.str());
}
}
return Status::OK();
@ -1235,17 +1238,18 @@ Config::CheckCacheConfigInsertBufferSize(const std::string& value) {
return Status(SERVER_INVALID_ARGUMENT, msg);
}
std::string str = GetConfigStr(CONFIG_CACHE, CONFIG_CACHE_CPU_CACHE_CAPACITY, "0");
std::string cs_str = GetConfigStr(CONFIG_CACHE, CONFIG_CACHE_CPU_CACHE_CAPACITY, "0");
std::string err;
int64_t cache_size = parse_bytes(str, err);
int64_t cache_size = parse_bytes(cs_str, err);
int64_t total_mem = 0, free_mem = 0;
GetSystemMemInfo(total_mem, free_mem);
if (buffer_size + cache_size >= total_mem) {
std::string msg = "Invalid insert buffer size: " + value +
". Possible reason: sum of cache.cache_size and "
"cache.insert_buffer_size exceeds system memory.";
return Status(SERVER_INVALID_ARGUMENT, msg);
std::stringstream ss;
ss << "Invalid insert buffer size: " << value << ". ";
ss << "Possible reason: sum of cache.cache_size (" << cs_str << ") and cache.insert_buffer_size ";
ss << "exceeds system memory (" << (total_mem >> 30) << "GB).";
return Status(SERVER_INVALID_ARGUMENT, ss.str());
}
}
return Status::OK();