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

[fix](group commit) handle group commit create plan error (#31757)

Browse Source
This commit is contained in:
meiyi
2024-03-05 18:55:03 +08:00
committed by yiguolei
parent 7b51c4aaca
commit eea9b56f69
6 changed files with 27 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
be/src/runtime/group_commit_mgr.cpp
View File

@ -209,13 +209,16 @@ Status GroupCommitTable::get_first_block_load_queue(
"schema version not match, maybe a schema change is in process. Please "
"retry this load manually.");
}
if (!_need_plan_fragment) {
_need_plan_fragment = true;
if (!_is_creating_plan_fragment) {
_is_creating_plan_fragment = true;
RETURN_IF_ERROR(_thread_pool->submit_func([&] {
auto st = _create_group_commit_load(load_block_queue, be_exe_version);
if (!st.ok()) {
LOG(WARNING) << "fail to create block queue,st=" << st.to_string();
LOG(WARNING) << "create group commit load error, st=" << st.to_string();
load_block_queue.reset();
std::unique_lock l(_lock);
_is_creating_plan_fragment = false;
_cv.notify_all();
}
}));
}
@ -241,13 +244,6 @@ Status GroupCommitTable::get_first_block_load_queue(
Status GroupCommitTable::_create_group_commit_load(
std::shared_ptr<LoadBlockQueue>& load_block_queue, int be_exe_version) {
Status st = Status::OK();
std::unique_ptr<int, std::function<void(int*)>> finish_plan_func((int*)0x01, [&](int*) {
if (!st.ok()) {
std::unique_lock l(_lock);
_need_plan_fragment = false;
_cv.notify_all();
}
});
TStreamLoadPutRequest request;
UniqueId load_id = UniqueId::gen_uid();
TUniqueId tload_id;
@ -281,13 +277,13 @@ Status GroupCommitTable::_create_group_commit_load(
10000L);
if (!st.ok()) {
LOG(WARNING) << "create group commit load rpc error, st=" << st.to_string();
return st;
}
RETURN_IF_ERROR(st);
st = Status::create<false>(result.status);
if (!st.ok()) {
LOG(WARNING) << "create group commit load error, st=" << st.to_string();
return st;
}
RETURN_IF_ERROR(st);
auto schema_version = result.base_schema_version;
auto is_pipeline = result.__isset.pipeline_params;
auto& params = result.params;
@ -326,7 +322,7 @@ Status GroupCommitTable::_create_group_commit_load(
be_exe_version));
}
_load_block_queues.emplace(instance_id, load_block_queue);
_need_plan_fragment = false;
_is_creating_plan_fragment = false;
_cv.notify_all();
}
st = _exec_plan_fragment(_db_id, _table_id, label, txn_id, is_pipeline, params,