diff --git a/cpp/CHANGELOG.md b/cpp/CHANGELOG.md index 50ced73b47cea33ae59adc09ac0c809b731ccb3d..6dc98f20aca1dffcafca06f897a22ca9e93048e0 100644 --- a/cpp/CHANGELOG.md +++ b/cpp/CHANGELOG.md @@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-449 - Add vectors twice success, once with ids, the other no ids - MS-461 - Mysql meta unittest failed - MS-462 - Run milvus server twices, should display error +- MS-463 - Search timeout ## Improvement - MS-327 - Clean code for milvus diff --git a/cpp/conf/server_config.template b/cpp/conf/server_config.template index 777b8dedb6e6ccae6ec3a303263bab847a5741c4..8cee387765d05934bb0480488f242007de6e3660 100644 --- a/cpp/conf/server_config.template +++ b/cpp/conf/server_config.template @@ -83,9 +83,13 @@ resource_config: # enable_executor: true # connection list, length: 0~N - # format: -${resource_name}===${resource_name} + # format: -${resource_name}===${resource_name} connections: - - ssda===cpu - - cpu===gpu0 + io: + speed: 500 + endpoint: ssda===cpu + pcie: + speed: 11000 + endpoint: cpu===gpu0 # - cpu===gtx1660 diff --git a/cpp/src/server/ServerConfig.h b/cpp/src/server/ServerConfig.h index 96d06ff550020de0a84659bcdc49c930f41a95d5..f60617ba266a7ca08636f4e4e4f70921aeb81582 100644 --- a/cpp/src/server/ServerConfig.h +++ b/cpp/src/server/ServerConfig.h @@ -58,7 +58,7 @@ static const char* CONFIG_RESOURCE_ENABLE_LOADER = "enable_loader"; static const char* CONFIG_RESOURCE_ENABLE_EXECUTOR = "enable_executor"; static const char* CONFIG_RESOURCE_CONNECTIONS = "connections"; static const char* CONFIG_SPEED_CONNECTIONS = "speed"; -static const char* CONFIG_ENDPOINT_CONNECTIONS = "connections"; +static const char* CONFIG_ENDPOINT_CONNECTIONS = "endpoint"; class ServerConfig {