udpate

apache · Aug 29, 2024 · aa732c7 · aa732c7
1 parent 03f1291
commit aa732c7
Showing 1 changed file with 7 additions and 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
@@ -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;