This is an automated email from the ASF dual-hosted git repository.
kxiao pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 7976bf37811 [Fix]check if fe set current connect fe (#36678)
7976bf37811 is described below
commit 7976bf378116d082573868830ba75c19921b905e
Author: wangbo <wan...@apache.org>
AuthorDate: Sun Jun 23 10:05:15 2024 +0800
[Fix]check if fe set current connect fe (#36678)
check if fe set current connect fe, when do gray upgrade, fe may not set
this value.
---
be/src/runtime/fragment_mgr.cpp | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/be/src/runtime/fragment_mgr.cpp b/be/src/runtime/fragment_mgr.cpp
index 66538529c3f..057a78827cc 100644
--- a/be/src/runtime/fragment_mgr.cpp
+++ b/be/src/runtime/fragment_mgr.cpp
@@ -692,11 +692,16 @@ Status FragmentMgr::_get_query_ctx(const Params& params,
TUniqueId query_id, boo
}
query_ctx->coord_addr = params.coord;
- query_ctx->current_connect_fe = params.current_connect_fe;
+ if (params.__isset.current_connect_fe) {
+ query_ctx->current_connect_fe = params.current_connect_fe;
+ } else {
+ // for upgrade, fe may not set current_connect_fe, we use coord
instead
+ query_ctx->current_connect_fe = params.coord;
+ }
LOG(INFO) << "query_id: " << UniqueId(query_ctx->query_id.hi,
query_ctx->query_id.lo)
<< " coord_addr " << query_ctx->coord_addr
<< " total fragment num on current host: " <<
params.fragment_num_on_host
- << " report audit fe:" << params.current_connect_fe;
+ << " report audit fe:" << query_ctx->current_connect_fe;
query_ctx->query_globals = params.query_globals;
if (params.__isset.resource_info) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
