From b591837e13b26bd99ef3886539e90f5eb3119244 Mon Sep 17 00:00:00 2001
From: meiyi <myimeiyi@gmail.com>
Date: Tue, 23 Jul 2024 20:21:38 +0800
Subject: [PATCH] [fix](insert) Pick Insert init plan error may forget to abort
 txn (#34220) (#38260)

Pick https://github.com/apache/doris/pull/34220
---
 .../plans/commands/insert/InsertIntoTableCommand.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertIntoTableCommand.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertIntoTableCommand.java
index 0d9f477f96..f524ee9672 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertIntoTableCommand.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/insert/InsertIntoTableCommand.java
@@ -137,7 +137,7 @@ public class InsertIntoTableCommand extends Command implements ForwardWithSync,
                     targetTableIf.getDatabase().getFullName() + "." + targetTableIf.getName());
         }
 
-        AbstractInsertExecutor insertExecutor;
+        AbstractInsertExecutor insertExecutor = null;
         // should lock target table until we begin transaction.
         targetTableIf.readLock();
         try {
@@ -199,8 +199,14 @@ public class InsertIntoTableCommand extends Command implements ForwardWithSync,
 
             insertExecutor.beginTransaction();
             insertExecutor.finalizeSink(planner.getFragments().get(0), sink, physicalSink);
-        } finally {
             targetTableIf.readUnlock();
+        } catch (Throwable e) {
+            targetTableIf.readUnlock();
+            // the abortTxn in onFail need to acquire table write lock
+            if (insertExecutor != null) {
+                insertExecutor.onFail(e);
+            }
+            throw e;
         }
 
         executor.setProfileType(ProfileType.LOAD);