database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[feature](executor)make scan task wait timeout config #28467

Browse Source
This commit is contained in:
wangbo
2023-12-16 11:36:15 +08:00
committed by GitHub
parent 920c75c870
commit 469edbdd3d
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
be/src/common/config.cpp
View File

@ -967,6 +967,7 @@ DEFINE_Bool(enable_debug_points, "false");
DEFINE_Int32(pipeline_executor_size, "0");
DEFINE_Bool(enable_workload_group_for_scan, "false");
DEFINE_mInt64(workload_group_scan_task_wait_timeout_ms, "10000");
// 128 MB
DEFINE_mInt64(local_exchange_buffer_mem_limit, "134217728");

1
be/src/common/config.h
View File

@ -1021,6 +1021,7 @@ DECLARE_Bool(enable_debug_points);
DECLARE_Int32(pipeline_executor_size);
DECLARE_Bool(enable_workload_group_for_scan);
DECLARE_mInt64(workload_group_scan_task_wait_timeout_ms);
// Temp config. True to use optimization for bitmap_index apply predicate except leaf node of the and node.
// Will remove after fully test.

10
be/src/vec/exec/scan/scan_task_queue.cpp
View File

@ -70,11 +70,14 @@ bool ScanTaskTaskGroupQueue::take(ScanTask* scan_task) {
return false;
}
if (_group_entities.empty()) {
_wait_task.wait_for(lock, std::chrono::milliseconds(WAIT_CORE_TASK_TIMEOUT_MS * 5));
_wait_task.wait_for(lock, std::chrono::milliseconds(
config::workload_group_scan_task_wait_timeout_ms));
} else {
entity = _next_tg_entity();
if (!entity) {
_wait_task.wait_for(lock, std::chrono::milliseconds(WAIT_CORE_TASK_TIMEOUT_MS));
_wait_task.wait_for(lock,
std::chrono::milliseconds(
config::workload_group_scan_task_wait_timeout_ms));
}
}
}
@ -82,7 +85,8 @@ bool ScanTaskTaskGroupQueue::take(ScanTask* scan_task) {
if (entity->task_size() == 1) {
_dequeue_task_group(entity);
}
return entity->task_queue()->try_get(scan_task, WAIT_CORE_TASK_TIMEOUT_MS /* timeout_ms */);
return entity->task_queue()->try_get(
scan_task, config::workload_group_scan_task_wait_timeout_ms /* timeout_ms */);
}
bool ScanTaskTaskGroupQueue::push_back(ScanTask scan_task) {

1
be/src/vec/exec/scan/scan_task_queue.h
View File

@ -28,7 +28,6 @@ class ScannerContext;
namespace taskgroup {
using WorkFunction = std::function<void()>;
static constexpr auto WAIT_CORE_TASK_TIMEOUT_MS = 100;
// Like PriorityThreadPool::Task
struct ScanTask {