diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index dd155a5f3b03ed9dd870a302c0d0503f35d8e7d7..f61928d29ed618d6808d675cecf40fb2231673fb 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -22,6 +22,7 @@ Please mark all change in change log and use the ticket from JIRA. - MS-644 - Search crashed with index-type: flat - MS-647 - grafana display average cpu-temp - MS-652 - IVFSQH quantization double free +- MS-650 - SQ8H index create issue - MS-653 - When config check fail, Milvus close without message - MS-654 - Describe index timeout when building index - MS-658 - Fix SQ8 Hybrid can't search diff --git a/core/src/scheduler/action/PushTaskToNeighbour.cpp b/core/src/scheduler/action/PushTaskToNeighbour.cpp index 7fbcf77afc123a84f807f20d7f43a2e3ade58d3a..4e7dbf984fe747676b8ac1e71c6f5fbfebbb9602 100644 --- a/core/src/scheduler/action/PushTaskToNeighbour.cpp +++ b/core/src/scheduler/action/PushTaskToNeighbour.cpp @@ -209,9 +209,11 @@ Action::SpecifiedResourceLabelTaskScheduler(ResourceMgrWPtr res_mgr, ResourcePtr } else { auto next_res_name = task->path().Next(); auto next_res = res_mgr.lock()->GetResource(next_res_name); - if (event->task_table_item_->Move()) { - next_res->task_table().Put(task); - } + // if (event->task_table_item_->Move()) { + // next_res->task_table().Put(task); + // } + event->task_table_item_->Move(); + next_res->task_table().Put(task); } } diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp index e99ee252551ec388f77a09879b81a5939a260112..59fd22b5d6d5259b4e4b69d9aab74de0d6e1dc97 100644 --- a/core/src/scheduler/resource/Resource.cpp +++ b/core/src/scheduler/resource/Resource.cpp @@ -125,6 +125,15 @@ Resource::pick_task_execute() { if (task_table_.Execute(index)) { return task_table_.Get(index); } + // if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) { + // if (task_table_.Get(index)->task->path().Current() == task_table_.Get(index)->task->path().Last() + // && + // task_table_.Get(index)->task->path().Last() == name()) { + // if (task_table_.Execute(index)) { + // return task_table_.Get(index); + // } + // } + // } // else try next } return nullptr; @@ -180,6 +189,7 @@ Resource::executor_function() { if (task_item->task->Type() == TaskType::BuildIndexTask) { BuildMgrInst::GetInstance()->Put(); ResMgrInst::GetInstance()->GetResource("cpu")->WakeupLoader(); + ResMgrInst::GetInstance()->GetResource("disk")->WakeupLoader(); } if (subscriber_) {