diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp index caca91f0358b8b..11641420d090a3 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 41045b3152ef86..a62a1933ed45e6 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 d6c47201dadf0a..e0b81283df15ed 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 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(); }