This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-2.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.1 by this push:
new c8e4c404fa6 [Fix]check if fe set thrift field current_connect_fe
(#36681)
c8e4c404fa6 is described below
commit c8e4c404fa6b00ddb7df4dcfa59cbbfbd135234e
Author: wangbo <[email protected]>
AuthorDate: Fri Jun 21 22:15:25 2024 +0800
[Fix]check if fe set thrift field current_connect_fe (#36681)
bp #36678
---
be/src/runtime/fragment_mgr.cpp | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index a7808cb6d56..08de61f8931 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -640,17 +640,26 @@ Status FragmentMgr::_get_query_ctx(const Params& params,
TUniqueId query_id, boo
return Status::OK();
}
+ TNetworkAddress current_connect_fe_addr;
+ // for gray upragde between 2.1 version, fe may not set
current_connect_fe,
+ // then use coord addr instead
+ if (params.__isset.current_connect_fe) {
+ current_connect_fe_addr = params.current_connect_fe;
+ } else {
+ current_connect_fe_addr = params.coord;
+ }
+
LOG(INFO) << "query_id: " << print_id(query_id) << ", coord_addr: " <<
params.coord
<< ", total fragment num on current host: " <<
params.fragment_num_on_host
<< ", fe process uuid: " <<
params.query_options.fe_process_uuid
<< ", query type: " << params.query_options.query_type
- << ", report audit fe:" << params.current_connect_fe;
+ << ", report audit fe:" << current_connect_fe_addr;
// This may be a first fragment request of the query.
// Create the query fragments context.
query_ctx = QueryContext::create_shared(query_id,
params.fragment_num_on_host, _exec_env,
params.query_options,
params.coord, pipeline,
- params.is_nereids,
params.current_connect_fe);
+ params.is_nereids,
current_connect_fe_addr);
SCOPED_SWITCH_THREAD_MEM_TRACKER_LIMITER(query_ctx->query_mem_tracker);
RETURN_IF_ERROR(DescriptorTbl::create(&(query_ctx->obj_pool),
params.desc_tbl,
&(query_ctx->desc_tbl)));
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
