From aa732c70da38f9c611da26fee6253e2757782021 Mon Sep 17 00:00:00 2001
From: yujun777 <yu.jun.reach@gmail.com>
Date: Thu, 29 Aug 2024 22:40:31 +0800
Subject: [PATCH] udpate

---
 .../java/org/apache/doris/master/ReportHandler.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
index 52c62860d83e1e..7dd018bdc33ce7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/master/ReportHandler.java
@@ -1124,7 +1124,7 @@ private static void deleteFromBackend(Map<Long, TTablet> backendTablets,
             }
 
             if (needDelete) {
-                deleteTabletFromBackend(tabletId, backendTablets, backendId, batchTask);
+                deleteTabletFromBackend(tabletId, tabletMeta, backendTablets, backendId, batchTask);
                 ++deleteFromBackendCounter;
             }
         } // end for backendTabletIds
@@ -1141,7 +1141,9 @@ private static void deleteFromBackend(Map<Long, TTablet> backendTablets,
                     olapTable.writeLockOrMetaException();
                 } catch (MetaNotFoundException e) {
                     for (long tabletId : table2Tablets.get(tableId)) {
-                        deleteTabletFromBackend(tabletId, backendTablets, backendId, batchTask);
+                        TabletMeta tabletMeta = invertedIndex.getTabletMeta(tabletId);
+                        deleteTabletFromBackend(tabletId, tabletMeta, backendTablets,
+                                backendId, batchTask);
                         ++deleteFromBackendCounter;
                     }
                     continue;
@@ -1160,7 +1162,7 @@ private static void deleteFromBackend(Map<Long, TTablet> backendTablets,
                             }
                             tryWriteBatchModifyReplica(batchInfo, false);
                         } else {
-                            deleteTabletFromBackend(tabletId, backendTablets, backendId, batchTask);
+                            deleteTabletFromBackend(tabletId, tabletMeta, backendTablets, backendId, batchTask);
                             ++deleteFromBackendCounter;
                             LOG.debug("failed add to meta. tablet[{}], backend[{}]", tabletId, backendId);
                         }
@@ -1180,12 +1182,11 @@ private static void deleteFromBackend(Map<Long, TTablet> backendTablets,
                 deleteFromBackendCounter, addToMetaCounter, backendId);
     }
 
-    private static void deleteTabletFromBackend(long tabletId, Map<Long, TTablet> backendTablets, long backendId,
-            AgentBatchTask batchTask) {
+    private static void deleteTabletFromBackend(long tabletId, TabletMeta tabletMeta,
+            Map<Long, TTablet> backendTablets, long backendId, AgentBatchTask batchTask) {
         TTablet backendTablet = backendTablets.get(tabletId);
         TTabletInfo backendTabletInfo = backendTablet.getTabletInfos().get(0);
         boolean needDelete = false;
-        TabletMeta tabletMeta = invertedIndex.getTabletMeta(tabletId);
         long replicaId = backendTabletInfo.getReplicaId();
         // If no such tablet meta, this indicates that the tablet belongs to a dropped table or partition
         boolean isDropTableOrPartition = tabletMeta == null;