From 732abc72c72696cc3bed16fc213b3ea187759685 Mon Sep 17 00:00:00 2001 From: "peng.xu" Date: Mon, 15 Jul 2019 15:55:35 +0800 Subject: [PATCH 1/3] change ci build time from 20 to 30 Former-commit-id: d289352f66750e7b3e4cb8990bc0f46580952c87 --- ci/jenkinsfile/milvus_build.groovy | 3 +-- ci/jenkinsfile/milvus_build_no_ut.groovy | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ci/jenkinsfile/milvus_build.groovy b/ci/jenkinsfile/milvus_build.groovy index 99892c90ef..016acfdefa 100644 --- a/ci/jenkinsfile/milvus_build.groovy +++ b/ci/jenkinsfile/milvus_build.groovy @@ -1,5 +1,5 @@ container('milvus-build-env') { - timeout(time: 20, unit: 'MINUTES') { + timeout(time: 30, unit: 'MINUTES') { gitlabCommitStatus(name: 'Build Engine') { dir ("milvus_engine") { try { @@ -17,4 +17,3 @@ container('milvus-build-env') { } } } - diff --git a/ci/jenkinsfile/milvus_build_no_ut.groovy b/ci/jenkinsfile/milvus_build_no_ut.groovy index 6c30ce491c..f4e243f1cc 100644 --- a/ci/jenkinsfile/milvus_build_no_ut.groovy +++ b/ci/jenkinsfile/milvus_build_no_ut.groovy @@ -1,5 +1,5 @@ container('milvus-build-env') { - timeout(time: 20, unit: 'MINUTES') { + timeout(time: 30, unit: 'MINUTES') { gitlabCommitStatus(name: 'Build Engine') { dir ("milvus_engine") { try { @@ -17,4 +17,3 @@ container('milvus-build-env') { } } } - From 813afe79076aae3f07a755d316a2fa002cdb224f Mon Sep 17 00:00:00 2001 From: "peng.xu" Date: Mon, 15 Jul 2019 17:30:13 +0800 Subject: [PATCH 2/3] add log before bg_error Former-commit-id: ab002bc46b2758d4061d5a25ff5f301d0f1516d0 --- cpp/src/db/DBImpl.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index 55fc9cea5a..baee3a84ab 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -89,6 +89,7 @@ DBImpl::DBImpl(const Options& options) meta_ptr_ = DBMetaImplFactory::Build(options.meta, options.mode); mem_mgr_ = MemManagerFactory::Build(meta_ptr_, options_); if (options.mode != Options::MODE::READ_ONLY) { + ENGINE_LOG_INFO << "StartTimerTasks"; StartTimerTasks(); } } @@ -390,14 +391,11 @@ Status DBImpl::BackgroundMergeFiles(const std::string& table_id) { } void DBImpl::BackgroundCompaction(std::set table_ids) { -// static int b_count = 0; -// b_count++; -// std::cout << "BackgroundCompaction: " << b_count << std::endl; - Status status; for (auto& table_id : table_ids) { status = BackgroundMergeFiles(table_id); if (!status.ok()) { + ENGINE_LOG_ERROR << "BGERROR found during merge files!"; bg_error_ = status; return; } @@ -408,7 +406,6 @@ void DBImpl::BackgroundCompaction(std::set table_ids) { int ttl = 1; if (options_.mode == Options::MODE::CLUSTER) { ttl = meta::D_SEC; -// ENGINE_LOG_DEBUG << "Server mode is cluster. Clean up files with ttl = " << std::to_string(ttl) << "seconds."; } meta_ptr_->CleanUpFilesWithTTL(ttl); } @@ -541,9 +538,9 @@ void DBImpl::BackgroundBuildIndex() { meta_ptr_->FilesToIndex(to_index_files); Status status; for (auto& file : to_index_files) { - /* ENGINE_LOG_DEBUG << "Buiding index for " << file.location; */ status = BuildIndex(file); if (!status.ok()) { + ENGINE_LOG_ERROR << "BGERROR found during build index!"; bg_error_ = status; return; } @@ -552,7 +549,6 @@ void DBImpl::BackgroundBuildIndex() { break; } } - /* ENGINE_LOG_DEBUG << "All Buiding index Done"; */ } Status DBImpl::DropAll() { From a8368f58464ea47043d0e8117952c87e2e53dec9 Mon Sep 17 00:00:00 2001 From: "peng.xu" Date: Mon, 15 Jul 2019 18:50:56 +0800 Subject: [PATCH 3/3] add more logging for bg_error break Former-commit-id: 3d3ddbe93c0770968d0ac4f86b82c0a94c0fa341 --- cpp/src/db/DBImpl.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/src/db/DBImpl.cpp b/cpp/src/db/DBImpl.cpp index baee3a84ab..8638a0da41 100644 --- a/cpp/src/db/DBImpl.cpp +++ b/cpp/src/db/DBImpl.cpp @@ -395,7 +395,7 @@ void DBImpl::BackgroundCompaction(std::set table_ids) { for (auto& table_id : table_ids) { status = BackgroundMergeFiles(table_id); if (!status.ok()) { - ENGINE_LOG_ERROR << "BGERROR found during merge files!"; + ENGINE_LOG_ERROR << "BGERROR found during merge files: " << status.ToString(); bg_error_ = status; return; } @@ -540,7 +540,7 @@ void DBImpl::BackgroundBuildIndex() { for (auto& file : to_index_files) { status = BuildIndex(file); if (!status.ok()) { - ENGINE_LOG_ERROR << "BGERROR found during build index!"; + ENGINE_LOG_ERROR << "BGERROR found during build index: " << status.ToString(); bg_error_ = status; return; }