[doris] branch master updated: [Fix](SparkLoad): fix the timeout aborted loadtasks are not cleaned up. (#15480)

[wangbo]

This is an automated email from the ASF dual-hosted git repository.

wangbo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git


The following commit(s) were added to refs/heads/master by this push:
     new 5db8b52441 [Fix](SparkLoad): fix the timeout aborted loadtasks are not 
cleaned up. (#15480)
5db8b52441 is described below

commit 5db8b524419f18a2869cd2fac6b6126ac18e45ad
Author: spaces-x <weixiao5...@gmail.com>
AuthorDate: Fri Dec 30 14:02:00 2022 +0800

    [Fix](SparkLoad): fix the timeout aborted loadtasks are not cleaned up. 
(#15480)
    
    Co-authored-by: spaces-x <weixian...@meituan.com>
---
 .../src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java 
b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java
index 83fe2c7d64..72bad582d5 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/load/loadv2/SparkLoadJob.java
@@ -695,6 +695,8 @@ public class SparkLoadJob extends BulkLoadJob {
             // clear job infos that not persist
             sparkLoadAppHandle = null;
             resourceDesc = null;
+            etlOutputPath = "";
+            appId = "";
             tableToLoadPartitions.clear();
             indexToPushBrokerReaderParams.clear();
             indexToSchemaHash.clear();
@@ -713,6 +715,13 @@ public class SparkLoadJob extends BulkLoadJob {
         clearJob();
     }
 
+    @Override
+    public void afterAborted(TransactionState txnState, boolean txnOperated, 
String txnStatusChangeReason)
+            throws UserException {
+        super.afterAborted(txnState, txnOperated, txnStatusChangeReason);
+        clearJob();
+    }
+
     @Override
     public void cancelJobWithoutCheck(FailMsg failMsg, boolean abortTxn, 
boolean needLog) {
         super.cancelJobWithoutCheck(failMsg, abortTxn, needLog);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org