You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2022/12/31 04:55:41 UTC
[doris] 01/02: [Fix](SparkLoad): fix the timeout aborted loadtasks are not cleaned up. (#15480)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-1.2-lts
in repository https://gitbox.apache.org/repos/asf/doris.git
commit 11708482a68a33af2b9117270c0c77ce9351f2f6
Author: spaces-x <we...@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 <we...@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-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org