From 0e2c2ae6a79c2a8c51375ee1925df50533178b8e Mon Sep 17 00:00:00 2001
From: yujun777 <yu.jun.reach@gmail.com>
Date: Thu, 12 Sep 2024 23:02:36 +0800
Subject: [PATCH] update

---
 .../doris/cloud/catalog/CloudTabletRebalancer.java    | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
index 6c8f86e34074c40..537535cb3810c85 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/catalog/CloudTabletRebalancer.java
@@ -895,7 +895,8 @@ private void balanceImpl(List<Long> bes, String clusterId, Map<Long, List<Tablet
             Tablet pickedTablet = beToTablets.get(srcBe).get(randomIndex);
             CloudReplica cloudReplica = (CloudReplica) pickedTablet.getReplicas().get(0);
 
-            if (Config.enable_cloud_warm_up_for_rebalance) {
+            // if srcBe is dead, destBe cann't download cache from it.
+            if (Config.enable_cloud_warm_up_for_rebalance && srcBe.isAlive()) {
                 if (isConflict(srcBe, destBe, cloudReplica, balanceType, futurePartitionToTablets,
                         futureBeToTabletsInTable)) {
                     continue;
@@ -904,7 +905,7 @@ private void balanceImpl(List<Long> bes, String clusterId, Map<Long, List<Tablet
                 try {
                     sendPreHeatingRpc(pickedTablet, srcBe, destBe);
                 } catch (Exception e) {
-                    break;
+                    continue;
                 }
 
                 InfightTask task = new InfightTask();
@@ -963,9 +964,6 @@ private void migrateTablets(Long srcBe, Long dstBe) {
                 LOG.info("src backend {} not found", srcBe);
                 continue;
             }
-            String clusterId = be.getCloudClusterId();
-            String clusterName = be.getCloudClusterName();
-
             // populate to followers
             Database db = Env.getCurrentInternalCatalog().getDbNullable(cloudReplica.getDbId());
             if (db == null) {
@@ -978,6 +976,9 @@ private void migrateTablets(Long srcBe, Long dstBe) {
                 continue;
             }
 
+            String clusterId = be.getCloudClusterId();
+            String clusterName = be.getCloudClusterName();
+
             table.readLock();
             try {
                 if (db.getTableNullable(cloudReplica.getTableId()) == null) {