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 b7ff97e6f51 [fix](txn) fix abortTxn by label does not acquire table write lock (#38777) b7ff97e6f51 is described below commit b7ff97e6f51de74ed651e253472a75080d954e7b Author: meiyi <myime...@gmail.com> AuthorDate: Sun Aug 4 10:32:50 2024 +0800 [fix](txn) fix abortTxn by label does not acquire table write lock (#38777) --- .../java/org/apache/doris/transaction/GlobalTransactionMgr.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java index 57ee12fe86c..f97fbf5f191 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java +++ b/fe/fe-core/src/main/java/org/apache/doris/transaction/GlobalTransactionMgr.java @@ -383,8 +383,11 @@ public class GlobalTransactionMgr implements GlobalTransactionMgrIface { // for http cancel stream load api @Override public void abortTransaction(Long dbId, String label, String reason) throws UserException { - DatabaseTransactionMgr dbTransactionMgr = getDatabaseTransactionMgr(dbId); - dbTransactionMgr.abortTransaction(label, reason); + Long txnId = getTransactionId(dbId, label); + if (txnId == null) { + throw new AnalysisException("txn with label " + label + " does not exist"); + } + abortTransaction(dbId, txnId, reason); } @Override --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org