Merge branch 'branch-0.4.0' into 'branch-0.4.0'

MS-462 - Run milvus server twices, should display error

See merge request megasearch/milvus!469

Former-commit-id: 359cb7028ef8296841ce9a943ea1422b408208f0

cpp/CHANGELOG.md

@@ -20,6 +20,7 @@ Please mark all change in change log and use the ticket from JIRA.
 - MS-450 - server hang after run stop_server.sh
 - 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
 
 ## Improvement
 - MS-327 - Clean code for milvus

cpp/conf/server_config.template

@@ -33,7 +33,9 @@ cache_config:
   insert_cache_immediately: false   # insert data will be load into cache immediately for hot query
   gpu_cache_capacity: 5             # how many memory are used as cache in gpu, unit: GB, RANGE: 0 ~ less than total memory
   gpu_cache_free_percent: 0.85      # old data will be erased from cache when cache is full, this value specify how much memory should be kept, range: greater than zero ~ 1.0
-  gpu_ids: 0,1                      # gpu id
+  gpu_ids:                          # gpu id
+    - 0
+    - 1
 
 engine_config:
   use_blas_threshold: 20

cpp/src/cache/GpuCacheMgr.cpp

@@ -21,17 +21,14 @@ namespace {
 
     std::vector<uint64_t> load() {
         server::ConfigNode& config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_CACHE);
-        std::string gpu_ids_str = config.GetValue(server::CONFIG_GPU_IDS, "0,1");
+        auto conf_gpu_ids = config.GetSequence(server::CONFIG_GPU_IDS);
 
         std::vector<uint64_t > gpu_ids;
 
-        std::stringstream ss(gpu_ids_str);
-        for (int i; ss >> i;) {
-            gpu_ids.push_back(i);
-            if (ss.peek() == ',') {
-                ss.ignore();
-            }
+        for (auto gpu_id : conf_gpu_ids) {
+            gpu_ids.push_back(std::atoi(gpu_id.c_str()));
         }
+
         return gpu_ids;
     }
 }

cpp/src/metrics/PrometheusMetrics.cpp

@@ -170,16 +170,12 @@ void PrometheusMetrics::CPUTemperature() {
 void PrometheusMetrics::GpuCacheUsageGaugeSet() {
     if(!startup_) return;
     server::ConfigNode& config = server::ServerConfig::GetInstance().GetConfig(server::CONFIG_CACHE);
-    std::string gpu_ids_str = config.GetValue(server::CONFIG_GPU_IDS, "0,1");
+    auto conf_gpu_ids = config.GetSequence(server::CONFIG_GPU_IDS);
 
     std::vector<uint64_t > gpu_ids;
 
-    std::stringstream ss(gpu_ids_str);
-    for (int i; ss >> i;) {
-        gpu_ids.push_back(i);
-        if (ss.peek() == ',') {
-            ss.ignore();
-        }
+    for (auto gpu_id : conf_gpu_ids) {
+        gpu_ids.push_back(std::atoi(gpu_id.c_str()));
     }
 
     for(auto i = 0; i < gpu_ids.size(); ++i) {

cpp/src/server/ServerConfig.h

@@ -45,9 +45,9 @@ static const char* CONFIG_METRIC_COLLECTOR = "collector";
 static const char* CONFIG_PROMETHEUS = "prometheus_config";
 static const char* CONFIG_METRIC_PROMETHEUS_PORT = "port";
 
-static const std::string CONFIG_ENGINE = "engine_config";
-static const std::string CONFIG_DCBT = "use_blas_threshold";
-static const std::string CONFIG_OMP_THREAD_NUM = "omp_thread_num";
+static const char* CONFIG_ENGINE = "engine_config";
+static const char* CONFIG_DCBT = "use_blas_threshold";
+static const char* CONFIG_OMP_THREAD_NUM = "omp_thread_num";
 
 static const char* CONFIG_RESOURCE = "resource_config";
 static const char* CONFIG_RESOURCES = "resources";

cpp/src/server/grpc_impl/GrpcMilvusServer.cpp

@@ -34,6 +34,17 @@ static std::unique_ptr<::grpc::Server> server;
 
 constexpr long MESSAGE_SIZE = -1;
 
+class NoReusePortOption : public ::grpc::ServerBuilderOption {
+ public:
+    void UpdateArguments(::grpc::ChannelArguments* args) override {
+        args->SetInt(GRPC_ARG_ALLOW_REUSEPORT, 0);
+    }
+
+    void UpdatePlugins(std::vector<std::unique_ptr<::grpc::ServerBuilderPlugin>>*
+    plugins) override {}
+};
+
+
 void
 GrpcMilvusServer::StartService() {
     if (server != nullptr) {
@@ -52,6 +63,7 @@ GrpcMilvusServer::StartService() {
     std::string server_address(address + ":" + std::to_string(port));
 
     ::grpc::ServerBuilder builder;
+    builder.SetOption(std::unique_ptr<::grpc::ServerBuilderOption>(new NoReusePortOption));
     builder.SetMaxReceiveMessageSize(MESSAGE_SIZE); //default 4 * 1024 * 1024
     builder.SetMaxSendMessageSize(MESSAGE_SIZE);
 

cpp/unittest/scheduler/scheduler_test.cpp

@@ -153,6 +153,26 @@ TEST_F(SchedulerTest, OnCopyCompleted) {
 
     sleep(3);
     ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
+
+}
+
+TEST_F(SchedulerTest, PushTaskToNeighbourRandomlyTest) {
+    const uint64_t NUM = 10;
+    std::vector<std::shared_ptr<TestTask>> tasks;
+    TableFileSchemaPtr dummy1 = std::make_shared<meta::TableFileSchema>();
+    dummy1->location_ = "location";
+
+    tasks.clear();
+
+    for (uint64_t i = 0; i < NUM; ++i) {
+        auto task = std::make_shared<TestTask>(dummy1);
+        task->label() = std::make_shared<DefaultLabel>();
+        tasks.push_back(task);
+        cpu_resource_.lock()->task_table().Put(task);
+    }
+
+    sleep(3);
+//    ASSERT_EQ(res_mgr_->GetResource(ResourceType::GPU, 1)->task_table().Size(), NUM);
 }
 
 class SchedulerTest2 : public testing::Test {