admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-02-02 01:06:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix stucked tasiks (#3666)

Browse Source 
Signed-off-by: shengjun.li <shengjun.li@zilliz.com>
This commit is contained in:
shengjun.li 2020-09-10 09:14:03 +08:00 committed by GitHub
parent 49a5cdf682
commit 384b09e993
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/scheduler/TaskTable.cpp
View File

@ -180,6 +180,8 @@ TaskTable::PickToLoad(uint64_t limit) {
cross = true;
indexes.push_back(index);
++pick_count;
} else {
cross = true;
}
}
// rc.ElapseFromBegin("PickToLoad ");
@ -252,6 +254,8 @@ TaskTable::PickToExecute(uint64_t limit) {
cross = true;
indexes.push_back(index);
++pick_count;
} else {
cross = true;
}
}
// rc.ElapseFromBegin("PickToExecute ");

12
core/src/scheduler/resource/Resource.cpp
View File

@ -172,10 +172,14 @@ Resource::loader_function() {
}
LoadFile(task_item->task);
task_item->Loaded();
if (task_item->from) {
task_item->from->Moved();
task_item->from->task = FinishedTask::Create(task_item->from->task);
task_item->from = nullptr;
auto& label = task_item->task->label();
if (label != nullptr && label->Type() != TaskLabelType::BROADCAST) {
if (task_item->from) {
task_item->from->Moved();
task_item->from->task = FinishedTask::Create(task_item->from->task);
task_item->from = nullptr;
}
}
if (subscriber_) {
auto event = std::make_shared<LoadCompletedEvent>(shared_from_this(), task_item);

2
core/unittest/CMakeLists.txt
View File

@ -222,8 +222,6 @@ if (MILVUS_GPU_VERSION)
link_directories("${CUDA_TOOLKIT_ROOT_DIR}/lib64")
set(unittest_libs ${unittest_libs}
${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs/libnvidia-ml.so
cudart
cublas
)
endif ()