fix

dataroaring · Sep 15, 2024 · 9bf9a4e · 9bf9a4e
1 parent f041141
commit 9bf9a4e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/be/src/agent/heartbeat_server.cpp b/be/src/agent/heartbeat_server.cpp
@@ -265,11 +265,10 @@ Status HeartbeatServer::_heartbeat(const TMasterInfo& master_info) {
  }
 
  if (master_info.meta_service_endpoint != config::meta_service_endpoint) {
- LOG(WARNING) << "Detected mismatch in meta_service_endpoint configuration between FE and BE. "
- << "FE meta_service_endpoint: "
- << master_info.meta_service_endpoint
- << ", BE meta_service_endpoint: "
- << config::meta_service_endpoint;
+ LOG(WARNING) << "Detected mismatch in meta_service_endpoint configuration between FE "
+ "and BE. "
+ << "FE meta_service_endpoint: " << master_info.meta_service_endpoint
+ << ", BE meta_service_endpoint: " << config::meta_service_endpoint;
  return Status::InvalidArgument<false>(
  "fe and be do not work in same mode, fe meta_service_endpoint: {},"
  " be meta_service_endpoint: {}",

diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudEnv.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudEnv.java
@@ -184,7 +184,7 @@ private Cloud.NodeInfoPB getLocalTypeFromMetaService() {
  if (allNodes.stream().anyMatch(n -> n.getNodeType() == NodeInfoPB.NodeType.FE_FOLLOWER)) {
  // multi followers mode, select first
  Optional<HostInfo> helperNode = allNodes.stream()
- .filter(nodeInfoPB -> nodeInfoPB.getNodeType() == NodeInfoPB.NodeType.FE_FOLLOWER)
+ .filter(nodeInfoPB -> nodeInfoPB.getNodeType() != NodeInfoPB.NodeType.FE_OBSERVER)
  .map(nodeInfoPB -> new HostInfo(
  Config.enable_fqdn_mode ? nodeInfoPB.getHost() : nodeInfoPB.getIp(), nodeInfoPB.getEditLogPort()))
  .min(Comparator.comparing(HostInfo::getHost));