Merge branch 'branch-0.5.0-yk' into 'branch-0.5.0'

MS-650 SQ8H index create issue

See merge request megasearch/milvus!741

Former-commit-id: 46dd13b7bba4c7b1bb6458faff72a9537cebb797

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

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);
     }
 }
 

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_) {