This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 35117f8ea45 [fix](upgrade) fe earlier than 3.0.2 does not set
metaservice endpoin (#41236) (#41237)
35117f8ea45 is described below
commit 35117f8ea456701db67018e81b8ca31d2328dfa2
Author: Yongqiang YANG <[email protected]>
AuthorDate: Tue Sep 24 20:32:28 2024 +0800
[fix](upgrade) fe earlier than 3.0.2 does not set metaservice endpoin
(#41236) (#41237)
…t(#41236)
---
be/src/agent/heartbeat_server.cpp | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/be/src/agent/heartbeat_server.cpp
b/be/src/agent/heartbeat_server.cpp
index 562950b54d4..146604aaab2 100644
--- a/be/src/agent/heartbeat_server.cpp
+++ b/be/src/agent/heartbeat_server.cpp
@@ -240,20 +240,12 @@ Status HeartbeatServer::_heartbeat(const TMasterInfo&
master_info) {
master_info.network_address.hostname,
master_info.network_address.port);
}
- if (need_report) {
- LOG(INFO) << "Master FE is changed or restarted. report tablet and
disk info immediately";
- _engine.notify_listeners();
- }
-
if (master_info.__isset.meta_service_endpoint != config::is_cloud_mode()) {
LOG(WARNING) << "Detected mismatch in cloud mode configuration between
FE and BE. "
<< "FE cloud mode: "
<< (master_info.__isset.meta_service_endpoint ? "true" :
"false")
- << ", BE cloud mode: " << (config::is_cloud_mode() ?
"true" : "false");
- return Status::InvalidArgument<false>(
- "fe and be do not work in same mode, fe cloud mode: {},"
- " be cloud mode: {}",
- master_info.__isset.meta_service_endpoint,
config::is_cloud_mode());
+ << ", BE cloud mode: " << (config::is_cloud_mode() ?
"true" : "false")
+ << ". If fe is earlier than version 3.0.2, the message
can be ignored.";
}
if (master_info.__isset.meta_service_endpoint) {
@@ -283,6 +275,11 @@ Status HeartbeatServer::_heartbeat(const TMasterInfo&
master_info) {
LOG(INFO) << "set config cloud_unique_id " <<
master_info.cloud_unique_id << " " << st;
}
+ if (need_report) {
+ LOG(INFO) << "Master FE is changed or restarted. report tablet and
disk info immediately";
+ _engine.notify_listeners();
+ }
+
return Status::OK();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
