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 9136ce9c823ea65d645a53f9ebe1e34001b2f29c Author: meiyi <[email protected]> AuthorDate: Wed Mar 15 21:46:40 2023 +0800 [fix](insert) Fragment is not cancelled when client quit without commit a rollback transation insert (#17678) --- fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java index bde1c15da6..d3994c04d9 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java +++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java @@ -22,7 +22,6 @@ import org.apache.doris.catalog.DatabaseIf; import org.apache.doris.catalog.Env; import org.apache.doris.cluster.ClusterNamespace; import org.apache.doris.common.Config; -import org.apache.doris.common.UserException; import org.apache.doris.common.telemetry.Telemetry; import org.apache.doris.common.util.DebugUtil; import org.apache.doris.datasource.CatalogIf; @@ -243,9 +242,9 @@ public class ConnectContext { if (isTxnModel()) { if (isTxnBegin()) { try { - Env.getCurrentGlobalTransactionMgr().abortTransaction( - currentDbId, txnEntry.getTxnConf().getTxnId(), "timeout"); - } catch (UserException e) { + InsertStreamTxnExecutor executor = new InsertStreamTxnExecutor(getTxnEntry()); + executor.abortTransaction(); + } catch (Exception e) { LOG.error("db: {}, txnId: {}, rollback error.", currentDb, txnEntry.getTxnConf().getTxnId(), e); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
