From 5f242c71e48132bd9a27585df8e54d95fe6b8ae7 Mon Sep 17 00:00:00 2001 From: quicksilver Date: Fri, 4 Sep 2020 09:57:53 +0800 Subject: [PATCH 1/3] Fix build milvus images error (#3575) * Fix build milvus images error Signed-off-by: quicksilver * Fix build milvus images error Signed-off-by: quicksilver --- ci/jenkins/Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 48cf613de8..5672e15271 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -97,6 +97,7 @@ pipeline { TARGET_REPO = "${params.DOKCER_REGISTRY_URL}/milvus/engine" SOURCE_TAG = "${CHANGE_TARGET ? CHANGE_TARGET : SEMVER}-${BINARY_VERSION}-${OS_NAME}-${LOWER_BUILD_TYPE}" TARGET_TAG = "${SEMVER}-${BINARY_VERSION}-${OS_NAME}-${LOWER_BUILD_TYPE}" + DOCKER_BUILDKIT = 1 } agent { kubernetes { From 45460218102864113e7d8f3f1e8c102e2512dc59 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Fri, 4 Sep 2020 10:36:32 +0800 Subject: [PATCH 2/3] [skip ci] add enhancement issue template (#3585) Signed-off-by: yudong.cai --- .github/ISSUE_TEMPLATE/enhancement.md | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/enhancement.md diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md new file mode 100644 index 0000000000..74ed61e07a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/enhancement.md @@ -0,0 +1,15 @@ +--- +name: "Enhancement request" +about: Suggest an enhancement idea for Milvus +title: '' +labels: '' +assignees: '' + +--- + +**Please state your issue using the following template and, most importantly, in English.** + +**What would you like to be added ?** + +**Why is this needed ?** + From ef5f3a862036bafaeb7c6372312bd97abf2faa75 Mon Sep 17 00:00:00 2001 From: chen qingxiang <67679556+godchen0212@users.noreply.github.com> Date: Fri, 4 Sep 2020 15:18:45 +0800 Subject: [PATCH 3/3] fix the crash caused by Task::label() is null in issue#3472 (#3523) (#3527) Signed-off-by: godchen0212 --- core/src/codecs/DeletedDocsFormat.cpp | 3 +++ core/src/scheduler/resource/Resource.cpp | 2 ++ core/src/scheduler/task/FinishedTask.cpp | 9 ++++++--- core/src/scheduler/task/FinishedTask.h | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/codecs/DeletedDocsFormat.cpp b/core/src/codecs/DeletedDocsFormat.cpp index dd50222acd..92632a16b8 100644 --- a/core/src/codecs/DeletedDocsFormat.cpp +++ b/core/src/codecs/DeletedDocsFormat.cpp @@ -86,9 +86,12 @@ DeletedDocsFormat::Write(const storage::FSHandlerPtr& fs_ptr, const std::string& size_t old_num_bytes; std::vector delete_ids; if (exists) { + CHECK_MAGIC_VALID(fs_ptr, full_file_path); + CHECK_SUM_VALID(fs_ptr, full_file_path); if (!fs_ptr->reader_ptr_->Open(temp_path)) { return Status(SERVER_CANNOT_OPEN_FILE, "Fail to open tmp deleted docs file: " + temp_path); } + fs_ptr->reader_ptr_->Seekg(MAGIC_SIZE + HEADER_SIZE); fs_ptr->reader_ptr_->Read(&old_num_bytes, sizeof(size_t)); delete_ids.resize(old_num_bytes / sizeof(engine::offset_t)); fs_ptr->reader_ptr_->Read(delete_ids.data(), old_num_bytes); diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp index f9ccaa9abb..6033215f37 100644 --- a/core/src/scheduler/resource/Resource.cpp +++ b/core/src/scheduler/resource/Resource.cpp @@ -217,6 +217,8 @@ Resource::executor_function() { ResMgrInst::GetInstance()->GetResource("disk")->WakeupLoader(); } + task_item->task = FinishedTask::Create(task_item->task); + if (subscriber_) { auto event = std::make_shared(shared_from_this(), task_item); subscriber_(std::static_pointer_cast(event)); diff --git a/core/src/scheduler/task/FinishedTask.cpp b/core/src/scheduler/task/FinishedTask.cpp index 46a42053c6..264a6270bd 100644 --- a/core/src/scheduler/task/FinishedTask.cpp +++ b/core/src/scheduler/task/FinishedTask.cpp @@ -14,11 +14,14 @@ namespace milvus::scheduler { std::shared_ptr -FinishedTask::Create() { - return std::make_shared(); +FinishedTask::Create(const TaskPtr& task) { + return std::make_shared(task); } -FinishedTask::FinishedTask() : Task(TaskType::SearchTask, nullptr) { +FinishedTask::FinishedTask(const TaskPtr& task) : Task(TaskType::SearchTask, nullptr) { + Task::task_path_ = task->task_path_; + Task::type_ = task->type_; + Task::label_ = task->label_; } Status diff --git a/core/src/scheduler/task/FinishedTask.h b/core/src/scheduler/task/FinishedTask.h index 0fa36c2e95..fdc6d2876a 100644 --- a/core/src/scheduler/task/FinishedTask.h +++ b/core/src/scheduler/task/FinishedTask.h @@ -20,10 +20,10 @@ namespace milvus::scheduler { class FinishedTask : public Task { public: static std::shared_ptr - Create(); + Create(const TaskPtr& task); public: - FinishedTask(); + explicit FinishedTask(const TaskPtr& task); Status OnLoad(LoadType type, uint8_t device_id) override;