solve conflicts

Signed-off-by: Wang Xiangyu <xy.wang@zilliz.com>

.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 ?**
+

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 {

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<FinishTaskEvent>(shared_from_this(), task_item);
                 subscriber_(std::static_pointer_cast<Event>(event));

core/src/scheduler/task/FinishedTask.cpp

@@ -14,11 +14,14 @@
 namespace milvus::scheduler {
 
 std::shared_ptr<FinishedTask>
-FinishedTask::Create() {
-    return std::make_shared<FinishedTask>();
+FinishedTask::Create(const TaskPtr& task) {
+    return std::make_shared<FinishedTask>(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

core/src/scheduler/task/FinishedTask.h

@@ -20,10 +20,10 @@ namespace milvus::scheduler {
 class FinishedTask : public Task {
  public:
     static std::shared_ptr<FinishedTask>
-    Create();
+    Create(const TaskPtr& task);
 
  public:
-    FinishedTask();
+    explicit FinishedTask(const TaskPtr& task);
 
     Status
     OnLoad(LoadType type, uint8_t device_id) override;