mirror of https://github.com/milvus-io/milvus.git
Caiyd update config (#1447)
* #1135 remove Nvidia owned files from faiss * #1432 update config template Signed-off-by: yudong.cai <yudong.cai@zilliz.com> * #1432 update config Signed-off-by: yudong.cai <yudong.cai@zilliz.com> * #1432 fix clang format Signed-off-by: yudong.cai <yudong.cai@zilliz.com> * #1432 add faiss build option back Signed-off-by: yudong.cai <yudong.cai@zilliz.com>pull/1460/head^2
parent
0e9cb6ee4f
commit
5fcc31a818
|
@ -46,9 +46,13 @@ server_config:
|
|||
# | loaded when Milvus server starts up. | | |
|
||||
# | '*' means preload all existing tables. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# auto_flush_interval | The interval, in milliseconds, at which Milvus | Integer | 1000 (ms) |
|
||||
# | automatically flushes data to disk. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
db_config:
|
||||
backend_url: sqlite://:@:/
|
||||
preload_table:
|
||||
auto_flush_interval: 1000
|
||||
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# Storage Config | Description | Type | Default |
|
||||
|
@ -165,3 +169,33 @@ gpu_resource_config:
|
|||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
tracing_config:
|
||||
json_config_path:
|
||||
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# WAL Config | Description | Type | Default |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# enable | Whether to enable write-ahead logging (WAL) in Milvus. | Boolean | true |
|
||||
# | If WAL is enabled, Milvus writes all data changes to log | | |
|
||||
# | files in advance before implementing data changes. WAL | | |
|
||||
# | ensures the atomicity and durability for Milvus operations.| | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# recovery_error_ignore| Whether to ignore logs with errors that happens during WAL | Boolean | true |
|
||||
# | recovery. If true, when Milvus restarts for recovery and | | |
|
||||
# | there are errors in WAL log files, log files with errors | | |
|
||||
# | are ignored. If false, Milvus does not restart when there | | |
|
||||
# | are errors in WAL log files. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# buffer_size | Sum total of the read buffer and the write buffer in MBs. | Integer | 256 (MB) |
|
||||
# | buffer_size must be in range [64, 4096] (MB). | | |
|
||||
# | If the value you specified is out of range, Milvus | | |
|
||||
# | automatically uses the boundary value closest to the | | |
|
||||
# | specified value. It is recommended you set buffer_size to | | |
|
||||
# | a value greater than the inserted data size of a single | | |
|
||||
# | insert operation for better performance. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# wal_path | Location of WAL log files. | String | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
wal_config:
|
||||
enable: true
|
||||
recovery_error_ignore: true
|
||||
buffer_size: 256
|
||||
wal_path: /var/lib/milvus/wal
|
||||
|
|
|
@ -46,7 +46,8 @@ server_config:
|
|||
# | loaded when Milvus server starts up. | | |
|
||||
# | '*' means preload all existing tables. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# auto_flush_interval | Interval of auto flush. Unit is millisecond. | Integer | 1000 |
|
||||
# auto_flush_interval | The interval, in milliseconds, at which Milvus | Integer | 1000 (ms) |
|
||||
# | automatically flushes data to disk. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
db_config:
|
||||
backend_url: sqlite://:@:/
|
||||
|
@ -170,22 +171,31 @@ tracing_config:
|
|||
json_config_path:
|
||||
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# Wal Config | Description | Type | Default |
|
||||
# WAL Config | Description | Type | Default |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# enable | Switch of function wal. | Boolean | false |
|
||||
# enable | Whether to enable write-ahead logging (WAL) in Milvus. | Boolean | true |
|
||||
# | If WAL is enabled, Milvus writes all data changes to log | | |
|
||||
# | files in advance before implementing data changes. WAL | | |
|
||||
# | ensures the atomicity and durability for Milvus operations.| | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# recovery_error_ignore| Whether ignore the error which happens during wal recovery | Boolean | true |
|
||||
# | stage. | | |
|
||||
# recovery_error_ignore| Whether to ignore logs with errors that happens during WAL | Boolean | true |
|
||||
# | recovery. If true, when Milvus restarts for recovery and | | |
|
||||
# | there are errors in WAL log files, log files with errors | | |
|
||||
# | are ignored. If false, Milvus does not restart when there | | |
|
||||
# | are errors in WAL log files. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# buffer_size | The size of the wal buffer. Unit is MB. | Integer | 256 |
|
||||
# | It should be in range [64, 4096]. If the value set out of | | |
|
||||
# | the range, the system will use the boundary value. | | |
|
||||
# buffer_size | Sum total of the read buffer and the write buffer in MBs. | Integer | 256 (MB) |
|
||||
# | buffer_size must be in range [64, 4096] (MB). | | |
|
||||
# | If the value you specified is out of range, Milvus | | |
|
||||
# | automatically uses the boundary value closest to the | | |
|
||||
# | specified value. It is recommended you set buffer_size to | | |
|
||||
# | a value greater than the inserted data size of a single | | |
|
||||
# | insert operation for better performance. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# wal_path | The root path of wal relative files, include wal meta | String | NULL |
|
||||
# | files. | | |
|
||||
# wal_path | Location of WAL log files. | String | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
wal_config:
|
||||
enable: true
|
||||
recovery_error_ignore: true
|
||||
buffer_size: 256 # MB
|
||||
wal_path: /tmp/milvus/wal
|
||||
buffer_size: 256
|
||||
wal_path: @MILVUS_DB_PATH@/wal
|
||||
|
|
|
@ -46,9 +46,13 @@ server_config:
|
|||
# | loaded when Milvus server starts up. | | |
|
||||
# | '*' means preload all existing tables. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# auto_flush_interval | The interval, in milliseconds, at which Milvus | Integer | 1000 (ms) |
|
||||
# | automatically flushes data to disk. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
db_config:
|
||||
backend_url: sqlite://:@:/
|
||||
preload_table:
|
||||
auto_flush_interval: 1000
|
||||
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# Storage Config | Description | Type | Default |
|
||||
|
@ -167,22 +171,31 @@ tracing_config:
|
|||
json_config_path:
|
||||
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# Wal Config | Description | Type | Default |
|
||||
# WAL Config | Description | Type | Default |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# enable | Switch of function wal. | Boolean | false |
|
||||
# enable | Whether to enable write-ahead logging (WAL) in Milvus. | Boolean | true |
|
||||
# | If WAL is enabled, Milvus writes all data changes to log | | |
|
||||
# | files in advance before implementing data changes. WAL | | |
|
||||
# | ensures the atomicity and durability for Milvus operations.| | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# recovery_error_ignore| Whether ignore the error which happens during wal recovery | Boolean | true |
|
||||
# | stage. | | |
|
||||
# recovery_error_ignore| Whether to ignore logs with errors that happens during WAL | Boolean | true |
|
||||
# | recovery. If true, when Milvus restarts for recovery and | | |
|
||||
# | there are errors in WAL log files, log files with errors | | |
|
||||
# | are ignored. If false, Milvus does not restart when there | | |
|
||||
# | are errors in WAL log files. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# buffer_size | The size of the wal buffer. Unit is MB. | Integer | 256 |
|
||||
# | It should be in range [64, 4096]. If the value set out of | | |
|
||||
# | the range, the system will use the boundary value. | | |
|
||||
# buffer_size | Sum total of the read buffer and the write buffer in MBs. | Integer | 256 (MB) |
|
||||
# | buffer_size must be in range [64, 4096] (MB). | | |
|
||||
# | If the value you specified is out of range, Milvus | | |
|
||||
# | automatically uses the boundary value closest to the | | |
|
||||
# | specified value. It is recommended you set buffer_size to | | |
|
||||
# | a value greater than the inserted data size of a single | | |
|
||||
# | insert operation for better performance. | | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
# wal_path | The root path of wal relative files, include wal meta | String | NULL |
|
||||
# | files. | | |
|
||||
# wal_path | Location of WAL log files. | String | |
|
||||
#----------------------+------------------------------------------------------------+------------+-----------------+
|
||||
wal_config:
|
||||
enable: true
|
||||
recovery_error_ignore: true
|
||||
buffer_size: 256 # MB
|
||||
wal_path: /tmp/milvus/wal
|
||||
buffer_size: 256
|
||||
wal_path: @MILVUS_DB_PATH@/wal
|
||||
|
|
|
@ -71,12 +71,12 @@ struct DBOptions {
|
|||
size_t insert_buffer_size_ = 4 * ONE_GB;
|
||||
bool insert_cache_immediately_ = false;
|
||||
|
||||
int auto_flush_interval_ = 1000;
|
||||
int64_t auto_flush_interval_ = 1000;
|
||||
|
||||
// wal relative configurations
|
||||
bool wal_enable_ = true;
|
||||
bool recovery_error_ignore_ = true;
|
||||
uint32_t buffer_size_ = 256;
|
||||
int64_t buffer_size_ = 256;
|
||||
std::string mxlog_path_ = "/tmp/milvus/wal/";
|
||||
}; // Options
|
||||
|
||||
|
|
|
@ -136,7 +136,7 @@ Config::ValidateConfig() {
|
|||
int64_t db_archive_days_threshold;
|
||||
CONFIG_CHECK(GetDBConfigArchiveDaysThreshold(db_archive_days_threshold));
|
||||
|
||||
int auto_flush_interval;
|
||||
int64_t auto_flush_interval;
|
||||
CONFIG_CHECK(GetDBConfigAutoFlushInterval(auto_flush_interval));
|
||||
|
||||
/* storage config */
|
||||
|
@ -235,7 +235,7 @@ Config::ValidateConfig() {
|
|||
bool recovery_error_ignore;
|
||||
CONFIG_CHECK(GetWalConfigRecoveryErrorIgnore(recovery_error_ignore));
|
||||
|
||||
uint32_t buffer_size;
|
||||
int64_t buffer_size;
|
||||
CONFIG_CHECK(GetWalConfigBufferSize(buffer_size));
|
||||
|
||||
std::string wal_path;
|
||||
|
@ -1037,36 +1037,6 @@ Config::CheckEngineConfigUseAVX512(const std::string& value) {
|
|||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::CheckWalConfigEnable(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsBool(value).ok()) {
|
||||
std::string msg = "Invalid wal config: " + value + ". Possible reason: wal_config.enable is not a boolean.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::CheckWalConfigRecoveryErrorIgnore(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsBool(value).ok()) {
|
||||
std::string msg =
|
||||
"Invalid wal config: " + value + ". Possible reason: wal_config.recovery_error_ignore is not a boolean.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::CheckWalConfigBufferSize(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsNumber(value).ok()) {
|
||||
std::string msg = "Invalid wal buffer size: " + value +
|
||||
". Possible reason: wal_config.buffer_size is not a positive integer.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
#ifdef MILVUS_GPU_VERSION
|
||||
|
||||
Status
|
||||
|
@ -1224,6 +1194,36 @@ Config::CheckGpuResourceConfigBuildIndexResources(const std::vector<std::string>
|
|||
|
||||
#endif
|
||||
|
||||
/* wal config */
|
||||
Status
|
||||
Config::CheckWalConfigEnable(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsBool(value).ok()) {
|
||||
std::string msg = "Invalid wal config: " + value + ". Possible reason: wal_config.enable is not a boolean.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::CheckWalConfigRecoveryErrorIgnore(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsBool(value).ok()) {
|
||||
std::string msg =
|
||||
"Invalid wal config: " + value + ". Possible reason: wal_config.recovery_error_ignore is not a boolean.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::CheckWalConfigBufferSize(const std::string& value) {
|
||||
if (!ValidationUtil::ValidateStringIsNumber(value).ok()) {
|
||||
std::string msg = "Invalid wal buffer size: " + value +
|
||||
". Possible reason: wal_config.buffer_size is not a positive integer.";
|
||||
return Status(SERVER_INVALID_ARGUMENT, msg);
|
||||
}
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
ConfigNode&
|
||||
Config::GetConfigRoot() {
|
||||
|
@ -1384,13 +1384,10 @@ Config::GetDBConfigPreloadTable(std::string& value) {
|
|||
}
|
||||
|
||||
Status
|
||||
Config::GetDBConfigAutoFlushInterval(int& value) {
|
||||
Config::GetDBConfigAutoFlushInterval(int64_t& value) {
|
||||
std::string str = GetConfigStr(CONFIG_DB, CONFIG_DB_AUTO_FLUSH_INTERVAL, CONFIG_DB_AUTO_FLUSH_INTERVAL_DEFAULT);
|
||||
Status s = CheckDBConfigAutoFlushInterval(str);
|
||||
if (!s.ok()) {
|
||||
return s;
|
||||
}
|
||||
value = (int)std::stoi(str);
|
||||
CONFIG_CHECK(CheckDBConfigAutoFlushInterval(str));
|
||||
value = std::stoll(str);
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
|
@ -1655,10 +1652,7 @@ Config::GetTracingConfigJsonConfigPath(std::string& value) {
|
|||
Status
|
||||
Config::GetWalConfigEnable(bool& wal_enable) {
|
||||
std::string str = GetConfigStr(CONFIG_WAL, CONFIG_WAL_ENABLE, CONFIG_WAL_ENABLE_DEFAULT);
|
||||
Status s = CheckWalConfigEnable(str);
|
||||
if (!s.ok()) {
|
||||
return s;
|
||||
}
|
||||
CONFIG_CHECK(CheckWalConfigEnable(str));
|
||||
std::transform(str.begin(), str.end(), str.begin(), ::tolower);
|
||||
wal_enable = (str == "true" || str == "on" || str == "yes" || str == "1");
|
||||
return Status::OK();
|
||||
|
@ -1668,29 +1662,23 @@ Status
|
|||
Config::GetWalConfigRecoveryErrorIgnore(bool& recovery_error_ignore) {
|
||||
std::string str =
|
||||
GetConfigStr(CONFIG_WAL, CONFIG_WAL_RECOVERY_ERROR_IGNORE, CONFIG_WAL_RECOVERY_ERROR_IGNORE_DEFAULT);
|
||||
Status s = CheckWalConfigRecoveryErrorIgnore(str);
|
||||
if (!s.ok()) {
|
||||
return s;
|
||||
}
|
||||
CONFIG_CHECK(CheckWalConfigRecoveryErrorIgnore(str));
|
||||
std::transform(str.begin(), str.end(), str.begin(), ::tolower);
|
||||
recovery_error_ignore = (str == "true" || str == "on" || str == "yes" || str == "1");
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::GetWalConfigBufferSize(uint32_t& buffer_size) {
|
||||
Config::GetWalConfigBufferSize(int64_t& buffer_size) {
|
||||
std::string str = GetConfigStr(CONFIG_WAL, CONFIG_WAL_BUFFER_SIZE, CONFIG_WAL_BUFFER_SIZE_DEFAULT);
|
||||
Status s = CheckWalConfigBufferSize(str);
|
||||
if (!s.ok()) {
|
||||
return s;
|
||||
}
|
||||
buffer_size = (uint32_t)std::stoul(str);
|
||||
CONFIG_CHECK(CheckWalConfigBufferSize(str));
|
||||
buffer_size = std::stoll(str);
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
Config::GetWalConfigWalPath(std::string& wal_path) {
|
||||
wal_path = GetConfigStr(CONFIG_WAL, CONFIG_WAL_WAL_PATH, "");
|
||||
wal_path = GetConfigStr(CONFIG_WAL, CONFIG_WAL_WAL_PATH, CONFIG_WAL_WAL_PATH_DEFAULT);
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
|
@ -1823,12 +1811,9 @@ Config::SetMetricConfigPort(const std::string& value) {
|
|||
Status
|
||||
Config::SetCacheConfigCpuCacheCapacity(const std::string& value) {
|
||||
CONFIG_CHECK(CheckCacheConfigCpuCacheCapacity(value));
|
||||
auto status = SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_CPU_CACHE_CAPACITY, value);
|
||||
if (status.ok()) {
|
||||
cache::CpuCacheMgr::GetInstance()->SetCapacity(std::stol(value) << 30);
|
||||
}
|
||||
|
||||
return status;
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_CPU_CACHE_CAPACITY, value));
|
||||
cache::CpuCacheMgr::GetInstance()->SetCapacity(std::stol(value) << 30);
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
Status
|
||||
|
@ -1840,22 +1825,14 @@ Config::SetCacheConfigCpuCacheThreshold(const std::string& value) {
|
|||
Status
|
||||
Config::SetCacheConfigInsertBufferSize(const std::string& value) {
|
||||
CONFIG_CHECK(CheckCacheConfigInsertBufferSize(value));
|
||||
auto status = SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_INSERT_BUFFER_SIZE, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_INSERT_BUFFER_SIZE, value));
|
||||
return ExecCallBacks(CONFIG_CACHE, CONFIG_CACHE_INSERT_BUFFER_SIZE, value);
|
||||
}
|
||||
|
||||
Status
|
||||
Config::SetCacheConfigCacheInsertData(const std::string& value) {
|
||||
CONFIG_CHECK(CheckCacheConfigCacheInsertData(value));
|
||||
auto status = SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_CACHE_INSERT_DATA, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_CACHE, CONFIG_CACHE_CACHE_INSERT_DATA, value));
|
||||
return ExecCallBacks(CONFIG_CACHE, CONFIG_CACHE_CACHE_INSERT_DATA, value);
|
||||
}
|
||||
|
||||
|
@ -1863,12 +1840,7 @@ Config::SetCacheConfigCacheInsertData(const std::string& value) {
|
|||
Status
|
||||
Config::SetEngineConfigUseBlasThreshold(const std::string& value) {
|
||||
CONFIG_CHECK(CheckEngineConfigUseBlasThreshold(value));
|
||||
|
||||
auto status = SetConfigValueInMem(CONFIG_ENGINE, CONFIG_ENGINE_USE_BLAS_THRESHOLD, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_ENGINE, CONFIG_ENGINE_USE_BLAS_THRESHOLD, value));
|
||||
return ExecCallBacks(CONFIG_ENGINE, CONFIG_ENGINE_USE_BLAS_THRESHOLD, value);
|
||||
}
|
||||
|
||||
|
@ -1885,18 +1857,12 @@ Config::SetEngineConfigUseAVX512(const std::string& value) {
|
|||
}
|
||||
|
||||
#ifdef MILVUS_GPU_VERSION
|
||||
/* gpu resource config */
|
||||
Status
|
||||
Config::SetEngineConfigGpuSearchThreshold(const std::string& value) {
|
||||
CONFIG_CHECK(CheckEngineConfigGpuSearchThreshold(value));
|
||||
auto status = SetConfigValueInMem(CONFIG_ENGINE, CONFIG_ENGINE_GPU_SEARCH_THRESHOLD, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_ENGINE, CONFIG_ENGINE_GPU_SEARCH_THRESHOLD, value));
|
||||
return ExecCallBacks(CONFIG_ENGINE, CONFIG_ENGINE_GPU_SEARCH_THRESHOLD, value);
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
/* gpu resource config */
|
||||
|
@ -1905,30 +1871,21 @@ Config::SetEngineConfigGpuSearchThreshold(const std::string& value) {
|
|||
Status
|
||||
Config::SetGpuResourceConfigEnable(const std::string& value) {
|
||||
CONFIG_CHECK(CheckGpuResourceConfigEnable(value));
|
||||
|
||||
auto status = SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_ENABLE, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_ENABLE, value));
|
||||
return ExecCallBacks(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_ENABLE, value);
|
||||
}
|
||||
|
||||
Status
|
||||
Config::SetGpuResourceConfigCacheCapacity(const std::string& value) {
|
||||
CONFIG_CHECK(CheckGpuResourceConfigCacheCapacity(value));
|
||||
auto status = SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_CACHE_CAPACITY, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_CACHE_CAPACITY, value));
|
||||
|
||||
int64_t cap = std::stol(value);
|
||||
std::vector<int64_t> gpus;
|
||||
GetGpuResourceConfigSearchResources(gpus);
|
||||
for (auto& g : gpus) {
|
||||
cache::GpuCacheMgr::GetInstance(g)->SetCapacity(cap << 30);
|
||||
for (auto& gpu_id : gpus) {
|
||||
cache::GpuCacheMgr::GetInstance(gpu_id)->SetCapacity(cap << 30);
|
||||
}
|
||||
|
||||
return Status::OK();
|
||||
}
|
||||
|
||||
|
@ -1943,11 +1900,7 @@ Config::SetGpuResourceConfigSearchResources(const std::string& value) {
|
|||
std::vector<std::string> res_vec;
|
||||
server::StringHelpFunctions::SplitStringByDelimeter(value, CONFIG_GPU_RESOURCE_DELIMITER, res_vec);
|
||||
CONFIG_CHECK(CheckGpuResourceConfigSearchResources(res_vec));
|
||||
auto status = SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_SEARCH_RESOURCES, value);
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_SEARCH_RESOURCES, value));
|
||||
return ExecCallBacks(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_SEARCH_RESOURCES, value);
|
||||
}
|
||||
|
||||
|
@ -1956,12 +1909,7 @@ Config::SetGpuResourceConfigBuildIndexResources(const std::string& value) {
|
|||
std::vector<std::string> res_vec;
|
||||
server::StringHelpFunctions::SplitStringByDelimeter(value, CONFIG_GPU_RESOURCE_DELIMITER, res_vec);
|
||||
CONFIG_CHECK(CheckGpuResourceConfigBuildIndexResources(res_vec));
|
||||
auto status = SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_BUILD_INDEX_RESOURCES, value);
|
||||
|
||||
if (!status.ok()) {
|
||||
return status;
|
||||
}
|
||||
|
||||
CONFIG_CHECK(SetConfigValueInMem(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_BUILD_INDEX_RESOURCES, value));
|
||||
return ExecCallBacks(CONFIG_GPU_RESOURCE, CONFIG_GPU_RESOURCE_BUILD_INDEX_RESOURCES, value);
|
||||
}
|
||||
|
||||
|
|
|
@ -130,7 +130,6 @@ static const char* CONFIG_GPU_RESOURCE_SEARCH_RESOURCES_DEFAULT = "gpu0";
|
|||
static const char* CONFIG_GPU_RESOURCE_BUILD_INDEX_RESOURCES = "build_index_resources";
|
||||
static const char* CONFIG_GPU_RESOURCE_BUILD_INDEX_RESOURCES_DEFAULT = "gpu0";
|
||||
|
||||
// TODO:
|
||||
/* tracing config */
|
||||
static const char* CONFIG_TRACING = "tracing_config";
|
||||
static const char* CONFIG_TRACING_JSON_CONFIG_PATH = "json_config_path";
|
||||
|
@ -138,12 +137,13 @@ static const char* CONFIG_TRACING_JSON_CONFIG_PATH = "json_config_path";
|
|||
/* wal config */
|
||||
static const char* CONFIG_WAL = "wal_config";
|
||||
static const char* CONFIG_WAL_ENABLE = "enable";
|
||||
static const char* CONFIG_WAL_ENABLE_DEFAULT = "false";
|
||||
static const char* CONFIG_WAL_ENABLE_DEFAULT = "true";
|
||||
static const char* CONFIG_WAL_RECOVERY_ERROR_IGNORE = "recovery_error_ignore";
|
||||
static const char* CONFIG_WAL_RECOVERY_ERROR_IGNORE_DEFAULT = "true";
|
||||
static const char* CONFIG_WAL_BUFFER_SIZE = "buffer_size";
|
||||
static const char* CONFIG_WAL_BUFFER_SIZE_DEFAULT = "256";
|
||||
static const char* CONFIG_WAL_WAL_PATH = "wal_path";
|
||||
static const char* CONFIG_WAL_WAL_PATH_DEFAULT = "/tmp/milvus/wal";
|
||||
|
||||
class Config {
|
||||
private:
|
||||
|
@ -262,14 +262,6 @@ class Config {
|
|||
Status
|
||||
CheckEngineConfigUseAVX512(const std::string& value);
|
||||
|
||||
/* wal config */
|
||||
Status
|
||||
CheckWalConfigEnable(const std::string& value);
|
||||
Status
|
||||
CheckWalConfigRecoveryErrorIgnore(const std::string& value);
|
||||
Status
|
||||
CheckWalConfigBufferSize(const std::string& value);
|
||||
|
||||
#ifdef MILVUS_GPU_VERSION
|
||||
Status
|
||||
CheckEngineConfigGpuSearchThreshold(const std::string& value);
|
||||
|
@ -287,6 +279,14 @@ class Config {
|
|||
CheckGpuResourceConfigBuildIndexResources(const std::vector<std::string>& value);
|
||||
#endif
|
||||
|
||||
/* wal config */
|
||||
Status
|
||||
CheckWalConfigEnable(const std::string& value);
|
||||
Status
|
||||
CheckWalConfigRecoveryErrorIgnore(const std::string& value);
|
||||
Status
|
||||
CheckWalConfigBufferSize(const std::string& value);
|
||||
|
||||
std::string
|
||||
GetConfigStr(const std::string& parent_key, const std::string& child_key, const std::string& default_value = "");
|
||||
std::string
|
||||
|
@ -321,7 +321,7 @@ class Config {
|
|||
Status
|
||||
GetDBConfigPreloadTable(std::string& value);
|
||||
Status
|
||||
GetDBConfigAutoFlushInterval(int& value);
|
||||
GetDBConfigAutoFlushInterval(int64_t& value);
|
||||
|
||||
/* storage config */
|
||||
Status
|
||||
|
@ -391,13 +391,10 @@ class Config {
|
|||
/* wal config */
|
||||
Status
|
||||
GetWalConfigEnable(bool& wal_enable);
|
||||
|
||||
Status
|
||||
GetWalConfigRecoveryErrorIgnore(bool& recovery_error_ignore);
|
||||
|
||||
Status
|
||||
GetWalConfigBufferSize(uint32_t& buffer_size);
|
||||
|
||||
GetWalConfigBufferSize(int64_t& buffer_size);
|
||||
Status
|
||||
GetWalConfigWalPath(std::string& wal_path);
|
||||
|
||||
|
|
Loading…
Reference in New Issue