fix

deardeng · Sep 13, 2024 · 2c035bb · 2c035bb
1 parent 6fb7c29
commit 2c035bb
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudClusterChecker.java
@@ -220,7 +220,13 @@ private void checkDiffNode(Map<String, ClusterPB> remoteClusterIdToPB,
  LOG.debug("current cluster status {} {}", currentClusterStatus, newClusterStatus);
  }
  boolean needChange = false;
- Set<String> clusterStatusInMem = cloudSystemInfoService.getClusterStatus(currentBes);
+ // ATTN: found bug, In the same cluster, the cluster status in the tags of BE nodes is inconsistent.
+ // Using a set to collect the cluster statuses from the BE nodes.
+ Set<String> clusterStatusInMem = new HashSet<>();
+ for (Backend backend : currentBes) {
+ String beClusterStatus = backend.getTagMap().get(Tag.CLOUD_CLUSTER_STATUS);
+ clusterStatusInMem.add(beClusterStatus == null ? "NOT_SET" : beClusterStatus);
+ }
  if (clusterStatusInMem.size() != 1) {
  LOG.warn("cluster {}, multi be nodes cluster status inconsistent, fix it {}", cid, clusterStatusInMem);
  needChange = true;

diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/system/CloudSystemInfoService.java
@@ -579,7 +579,7 @@ public String getCloudStatusByIdNoLock(final String clusterId) {
  Optional<String> hasNormal = bes.stream().map(Backend::getCloudClusterStatus)
  .filter(status -> status.equals(String.valueOf(Cloud.ClusterStatus.NORMAL))).findAny();
  return hasNormal.orElseGet(() -> bes.stream().map(Backend::getCloudClusterStatus).findFirst()
- .orElse(String.valueOf(Cloud.ClusterStatus.UNKNOWN)));
+ .orElse(String.valueOf(Cloud.ClusterStatus.NORMAL)));
  }
 
  public void updateClusterNameToId(final String newName,

diff --git a/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java b/fe/fe-core/src/main/java/org/apache/doris/system/Backend.java
@@ -188,7 +188,7 @@ public Backend(long id, String host, int heartbeatPort) {
  }
 
  public String getCloudClusterStatus() {
- return tagMap.getOrDefault(Tag.CLOUD_CLUSTER_STATUS, String.valueOf(Cloud.ClusterStatus.UNKNOWN));
+ return tagMap.getOrDefault(Tag.CLOUD_CLUSTER_STATUS, String.valueOf(Cloud.ClusterStatus.NORMAL));
  }
 
  public void setCloudClusterStatus(final String clusterStatus) {

diff --git a/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy b/regression-test/suites/cloud_p0/multi_cluster/test_auto_start.groovy
@@ -178,7 +178,7 @@ suite('test_auto_start_in_cloud', 'multi_cluster, docker') {
  // add 1 nodes, check it status NORMAL
  cluster.addBackend(1, null)
  dockerAwaitUntil(5) {
- def result = sql """SHOW BACKENDS"""
+ result = sql """SHOW BACKENDS"""
  result.size() == 4
  }
 
@@ -189,7 +189,7 @@ suite('test_auto_start_in_cloud', 'multi_cluster, docker') {
  return
  }
  jsonObject = jsonSlurper.parseText(tag)
- String cluster_status = jsonObject.cloud_cluster_status
+ cluster_status = jsonObject.cloud_cluster_status
  assertEquals("NORMAL", cluster_status)
  }
  }