From af5c5b3bdbad62a5c13adc1cb53e5803fd52a193 Mon Sep 17 00:00:00 2001 From: groot Date: Fri, 29 Nov 2019 14:47:13 +0800 Subject: [PATCH 1/3] #606 no log generated during building index with CPU --- CHANGELOG.md | 1 + core/src/db/DBImpl.cpp | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2956b867fb..60ee5fcadc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ Please mark all change in change log and use the ticket from JIRA. - \#543 - client raise exception in shards when search results is empty - \#545 - Avoid dead circle of build index thread when error occurs - \#561 - Milvus server should report exception/error message or terminate on mysql metadata backend error +- \#606 - No log generated during building index with CPU ## Feature - \#12 - Pure CPU version for Milvus diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp index 0b3309d84e..eef6788d7e 100644 --- a/core/src/db/DBImpl.cpp +++ b/core/src/db/DBImpl.cpp @@ -836,13 +836,13 @@ DBImpl::BackgroundBuildIndex() { if (!to_index_files.empty()) { // step 2: put build index task to scheduler - std::map job2file_map; + std::vector> job2file_map; for (auto& file : to_index_files) { scheduler::BuildIndexJobPtr job = std::make_shared(meta_ptr_, options_); scheduler::TableFileSchemaPtr file_ptr = std::make_shared(file); job->AddToIndexFiles(file_ptr); scheduler::JobMgrInst::GetInstance()->Put(job); - job2file_map.insert(std::make_pair(job, file_ptr)); + job2file_map.push_back(std::make_pair(job, file_ptr)); } for (auto iter = job2file_map.begin(); iter != job2file_map.end(); ++iter) { From 59f17fcc5965656ee3852275dab759f1cb67d8c4 Mon Sep 17 00:00:00 2001 From: "yudong.cai" Date: Fri, 29 Nov 2019 15:02:13 +0800 Subject: [PATCH 2/3] #605 print more messages when server start --- CHANGELOG.md | 1 + core/src/server/Config.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 594e886904..b87df27d1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -50,6 +50,7 @@ Please mark all change in change log and use the ticket from JIRA. - \#488 - Add log in scheduler/optimizer - \#502 - C++ SDK support IVFPQ and SPTAG - \#560 - Add version in server config file +- \#605 - Print more messages when server start ## Improvement - \#255 - Add ivfsq8 test report detailed version diff --git a/core/src/server/Config.cpp b/core/src/server/Config.cpp index cd9b264fcd..6643841fcc 100644 --- a/core/src/server/Config.cpp +++ b/core/src/server/Config.cpp @@ -205,6 +205,7 @@ Config::ValidateConfig() { return s; } + std::cout << "GPU resources " << (gpu_resource_enable ? "ENABLED !" : "DISABLED !") << std::endl; if (gpu_resource_enable) { int64_t resource_cache_capacity; s = GetGpuResourceConfigCacheCapacity(resource_cache_capacity); From 5ace001bbe569ea47c94aee7de22b44ebf5d3be7 Mon Sep 17 00:00:00 2001 From: ZhifengZhang-CN Date: Fri, 29 Nov 2019 15:22:10 +0800 Subject: [PATCH 3/3] update build environment images resources limits --- ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml | 4 ++-- ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml b/ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml index 58eae39061..4631c26e09 100644 --- a/ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-cpu-version-build-env-pod.yaml @@ -21,10 +21,10 @@ spec: tty: true resources: limits: - memory: "32Gi" + memory: "12Gi" cpu: "8.0" requests: - memory: "16Gi" + memory: "8Gi" cpu: "4.0" - name: milvus-mysql image: mysql:5.6 diff --git a/ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml b/ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml index bd321a87ae..d4eff370a8 100644 --- a/ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml +++ b/ci/jenkins/pod/milvus-gpu-version-build-env-pod.yaml @@ -21,11 +21,11 @@ spec: tty: true resources: limits: - memory: "32Gi" + memory: "12Gi" cpu: "8.0" nvidia.com/gpu: 1 requests: - memory: "16Gi" + memory: "8Gi" cpu: "4.0" - name: milvus-mysql image: mysql:5.6