(doris) branch master updated: [fix](cloud) should do check before abort transaction (#40463)

[dataroaring]

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

dataroaring 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 258ec3db385 [fix](cloud) should do check before abort transaction 
(#40463)
258ec3db385 is described below

commit 258ec3db385ae82c5b37e27f7c19e993092fb242
Author: hui lai <1353307...@qq.com>
AuthorDate: Mon Sep 9 23:47:39 2024 +0800

    [fix](cloud) should do check before abort transaction (#40463)
    
    When routine load task transaction is abort, it should do check before
    abort transaction, otherwise, it may cause concurrent modifications to
    the `routineLoadTaskInfoList`, which in the Java language may result in
    elements in the list being null, leading to a loop throwing
    NullPointerException during scheduling and making it impossible to
    schedule routine load task to consume Kafka stream.
---
 .../doris/cloud/transaction/CloudGlobalTransactionMgr.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git 
a/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
 
b/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
index f51454ad269..f224d2929a6 100644
--- 
a/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
+++ 
b/fe/fe-core/src/main/java/org/apache/doris/cloud/transaction/CloudGlobalTransactionMgr.java
@@ -990,6 +990,20 @@ public class CloudGlobalTransactionMgr implements 
GlobalTransactionMgrIface {
             TxnCommitAttachment txnCommitAttachment, List<Table> tableList) 
throws UserException {
         LOG.info("try to abort transaction, dbId:{}, transactionId:{}", dbId, 
transactionId);
 
+        if (txnCommitAttachment != null) {
+            if (txnCommitAttachment instanceof RLTaskTxnCommitAttachment) {
+                RLTaskTxnCommitAttachment rlTaskTxnCommitAttachment = 
(RLTaskTxnCommitAttachment) txnCommitAttachment;
+                TxnStateChangeCallback cb = 
callbackFactory.getCallback(rlTaskTxnCommitAttachment.getJobId());
+                if (cb != null) {
+                    // use a temporary transaction state to do before commit 
check,
+                    // what actually works is the transactionId
+                    TransactionState tmpTxnState = new TransactionState();
+                    tmpTxnState.setTransactionId(transactionId);
+                    cb.beforeAborted(tmpTxnState);
+                }
+            }
+        }
+
         AbortTxnRequest.Builder builder = AbortTxnRequest.newBuilder();
         builder.setDbId(dbId);
         builder.setTxnId(transactionId);


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