Skip to content

[Log](topn) Log query id in topn two read and change the timeout to uery timeout #53450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HappenLee merged 1 commit into from
Jul 18, 2025
Merged

[Log](topn) Log query id in topn two read and change the timeout to uery timeout #53450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion be/src/common/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,6 @@ DEFINE_Int32(doris_max_remote_scanner_thread_pool_thread_num, "-1");
DEFINE_Int32(doris_scanner_thread_pool_queue_size, "102400");
// default thrift client connect timeout(in seconds)
DEFINE_mInt32(thrift_connect_timeout_seconds, "3");
DEFINE_mInt32(fetch_rpc_timeout_seconds, "30");

// default thrift client retry interval (in milliseconds)
DEFINE_mInt64(thrift_client_retry_interval_ms, "1000");
Expand Down
1 change: 0 additions & 1 deletion be/src/common/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,6 @@ DECLARE_Int32(doris_max_remote_scanner_thread_pool_thread_num);
DECLARE_Int32(doris_scanner_thread_pool_queue_size);
// default thrift client connect timeout(in seconds)
DECLARE_mInt32(thrift_connect_timeout_seconds);
DECLARE_mInt32(fetch_rpc_timeout_seconds);
// default thrift client retry interval (in milliseconds)
DECLARE_mInt64(thrift_client_retry_interval_ms);
// max message size of thrift request
Expand Down
16 changes: 9 additions & 7 deletions be/src/exec/rowid_fetcher.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ Status RowIDFetcher::fetch(const vectorized::ColumnPtr& column_row_ids,
std::vector<brpc::Controller> cntls(_stubs.size());
bthread::CountdownEvent counter(cast_set<int>(_stubs.size()));
for (size_t i = 0; i < _stubs.size(); ++i) {
cntls[i].set_timeout_ms(config::fetch_rpc_timeout_seconds * 1000);
cntls[i].set_timeout_ms(_fetch_option.runtime_state->execution_timeout() * 1000);
auto callback = brpc::NewCallback(fetch_callback, &counter);
_stubs[i]->multiget_data(&cntls[i], &mget_req, &resps[i], callback);
}
Expand Down Expand Up @@ -469,16 +469,17 @@ Status RowIdStorageReader::read_by_rowids(const PMultiGetRequest& request,

LOG(INFO) << "Query stats: "
<< fmt::format(
"query_id:{}, "
"hit_cached_pages:{}, total_pages_read:{}, compressed_bytes_read:{}, "
"io_latency:{}ns, "
"uncompressed_bytes_read:{},"
"bytes_read:{},"
"acquire_tablet_ms:{}, acquire_rowsets_ms:{}, acquire_segments_ms:{}, "
"lookup_row_data_ms:{}",
stats.cached_pages_num, stats.total_pages_num, stats.compressed_bytes_read,
stats.io_ns, stats.uncompressed_bytes_read, stats.bytes_read,
acquire_tablet_ms, acquire_rowsets_ms, acquire_segments_ms,
lookup_row_data_ms);
print_id(request.query_id()), stats.cached_pages_num,
stats.total_pages_num, stats.compressed_bytes_read, stats.io_ns,
stats.uncompressed_bytes_read, stats.bytes_read, acquire_tablet_ms,
acquire_rowsets_ms, acquire_segments_ms, lookup_row_data_ms);
return Status::OK();
}

Expand Down Expand Up @@ -583,15 +584,16 @@ Status RowIdStorageReader::read_by_rowids(const PMultiGetRequestV2& request,

LOG(INFO) << "Query stats: "
<< fmt::format(
"query_id:{}, "
"Internal table:"
"hit_cached_pages:{}, total_pages_read:{}, compressed_bytes_read:{}, "
"io_latency:{}ns, uncompressed_bytes_read:{}, bytes_read:{}, "
"acquire_tablet_ms:{}, acquire_rowsets_ms:{}, acquire_segments_ms:{}, "
"lookup_row_data_ms:{}, file_types:[{}]; "
"External table : init_reader_ms:{}, get_block_ms:{}, "
"external_scan_range_cnt:{}",
stats.cached_pages_num, stats.total_pages_num,
stats.compressed_bytes_read, stats.io_ns,
print_id(request.query_id()), stats.cached_pages_num,
stats.total_pages_num, stats.compressed_bytes_read, stats.io_ns,
stats.uncompressed_bytes_read, stats.bytes_read, acquire_tablet_ms,
acquire_rowsets_ms, acquire_segments_ms, lookup_row_data_ms,
file_type_stats, external_init_reader_avg_ms,
Expand Down
2 changes: 1 addition & 1 deletion be/src/pipeline/exec/materialization_sink_operator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ Status MaterializationSinkOperatorX::sink(RuntimeState* state, vectorized::Block
auto callback = MaterializationCallback<PMultiGetResponseV2>::create_shared(
state->get_task_execution_context(), local_state._shared_state,
rpc_struct.rpc_timer, print_id(rpc_struct.request.query_id()));
callback->cntl_->set_timeout_ms(config::fetch_rpc_timeout_seconds * 1000);
callback->cntl_->set_timeout_ms(state->execution_timeout() * 1000);
auto closure =
AutoReleaseClosure<int, ::doris::DummyBrpcCallback<PMultiGetResponseV2>>::
create_unique(
Expand Down
Loading