This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new a8441841ccd branch-3.1: [Log](topn) Log query id in topn two read and
change the timeout to query timeout #52573 (#53822)
a8441841ccd is described below
commit a8441841ccdeeada92e15d3d19cbb26c9415e07d
Author: HappenLee <[email protected]>
AuthorDate: Thu Jul 24 18:56:03 2025 +0800
branch-3.1: [Log](topn) Log query id in topn two read and change the
timeout to query timeout #52573 (#53822)
picked from #52573
---
be/src/common/config.cpp | 1 -
be/src/common/config.h | 1 -
be/src/exec/rowid_fetcher.cpp | 11 ++++++-----
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp
index caca91f0358..11641420d09 100644
--- a/be/src/common/config.cpp
+++ b/be/src/common/config.cpp
@@ -314,7 +314,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");
diff --git a/be/src/common/config.h b/be/src/common/config.h
index 41045b3152e..a62a1933ed4 100644
--- a/be/src/common/config.h
+++ b/be/src/common/config.h
@@ -357,7 +357,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
diff --git a/be/src/exec/rowid_fetcher.cpp b/be/src/exec/rowid_fetcher.cpp
index d6c47201dad..e0b81283df1 100644
--- a/be/src/exec/rowid_fetcher.cpp
+++ b/be/src/exec/rowid_fetcher.cpp
@@ -231,7 +231,7 @@ Status RowIDFetcher::fetch(const vectorized::ColumnPtr&
column_row_ids,
std::vector<brpc::Controller> cntls(_stubs.size());
bthread::CountdownEvent counter(_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);
}
@@ -465,16 +465,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();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
