mirror of
https://gitee.com/milvus-io/milvus.git
synced 2024-12-06 05:49:24 +08:00
fix BuildIndex hang bug but not fix CreateIndex after DropIndex
Former-commit-id: 70d820bc29bc59e8ca18eaf36ec7eef01cca7f36
This commit is contained in:
parent
ed93701efd
commit
5229216464
@ -97,7 +97,7 @@ void
|
||||
Scheduler::OnLoadCompleted(const EventPtr& event) {
|
||||
auto load_completed_event = std::static_pointer_cast<LoadCompletedEvent>(event);
|
||||
if (auto resource = event->resource_.lock()) {
|
||||
resource->WakeupExecutor();
|
||||
// resource->WakeupExecutor();
|
||||
|
||||
auto task_table_type = load_completed_event->task_table_item_->task->label()->Type();
|
||||
switch (task_table_type) {
|
||||
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -116,15 +116,23 @@ Resource::pick_task_execute() {
|
||||
auto indexes = task_table_.PickToExecute(std::numeric_limits<uint64_t>::max());
|
||||
for (auto index : indexes) {
|
||||
// try to set one task executing, then return
|
||||
// if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
|
||||
// if (task_table_[index]->task->path().Last() != name()) {
|
||||
// continue;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (task_table_.Execute(index)) {
|
||||
// return task_table_.Get(index);
|
||||
// }
|
||||
if (task_table_[index]->task->label()->Type() == TaskLabelType::SPECIFIED_RESOURCE) {
|
||||
if (task_table_[index]->task->path().Last() != name()) {
|
||||
continue;
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (task_table_.Execute(index)) {
|
||||
return task_table_.Get(index);
|
||||
}
|
||||
// else try next
|
||||
}
|
||||
return nullptr;
|
||||
|
Loading…
Reference in New Issue
Block a user