This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new ee2f9a6e252 branch-3.1: [chore](conf) change
max_running_txn_num_per_db to 10000 #51367 (#52381)
ee2f9a6e252 is described below
commit ee2f9a6e25256c8f802a0add3413af4a31d74d2f
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jun 27 18:19:33 2025 +0800
branch-3.1: [chore](conf) change max_running_txn_num_per_db to 10000 #51367
(#52381)
Cherry-picked from #51367
Co-authored-by: Yongqiang YANG <[email protected]>
Co-authored-by: Yongqiang YANG <[email protected]>
---
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 2 +-
.../java/org/apache/doris/transaction/DatabaseTransactionMgr.java | 6 ++++++
fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEnv.java | 5 +++++
.../src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java | 5 +++--
4 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
index b5d12759028..23da54f52a0 100644
--- a/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
+++ b/fe/fe-common/src/main/java/org/apache/doris/common/Config.java
@@ -687,7 +687,7 @@ public class Config extends ConfigBase {
"单个数据库最大并发运行的事务数，包括 prepare 和 commit 事务。",
"Maximum concurrent running txn num including prepare, commit txns
under a single db.",
"Txn manager will reject coming txns."})
- public static int max_running_txn_num_per_db = 1000;
+ public static int max_running_txn_num_per_db = 10000;
@ConfField(masterOnly = true, description = {"pending load task
执行线程数。这个配置可以限制当前等待的导入作业数。"
+ "并且应小于 `max_running_txn_num_per_db`。",
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
index 59d5bc571f0..119571b7b29 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/transaction/DatabaseTransactionMgr.java
@@ -36,6 +36,7 @@ import org.apache.doris.catalog.TabletMeta;
import org.apache.doris.common.AnalysisException;
import org.apache.doris.common.Config;
import org.apache.doris.common.DuplicatedRequestException;
+import org.apache.doris.common.FeConstants;
import org.apache.doris.common.FeNameFormat;
import org.apache.doris.common.LabelAlreadyUsedException;
import org.apache.doris.common.LoadException;
@@ -314,6 +315,11 @@ public class DatabaseTransactionMgr {
long listenerId, long timeoutSecond)
throws DuplicatedRequestException, LabelAlreadyUsedException,
BeginTransactionException,
AnalysisException, QuotaExceedException, MetaNotFoundException {
+
+ if (!Env.getCurrentEnv().isMaster() && !FeConstants.runningUnitTest) {
+ throw new BeginTransactionException("FE is not master");
+ }
+
Database db = env.getInternalCatalog().getDbOrMetaException(dbId);
if (!coordinator.isFromInternal) {
InternalDatabaseUtil.checkDatabase(db.getFullName(),
ConnectContext.get());
diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEnv.java
b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEnv.java
index 32f32cf9e7e..d4fc9b5d8b0 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEnv.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/FakeEnv.java
@@ -60,4 +60,9 @@ public class FakeEnv extends MockUp<Env> {
return systemInfo;
}
+ @Mock
+ public boolean isMaster() {
+ return true;
+ }
+
}
diff --git
a/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java
b/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java
index 1746f2d6d8c..0d04afb130e 100644
--- a/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java
+++ b/fe/fe-core/src/test/java/org/apache/doris/common/proc/DbsProcDirTest.java
@@ -20,6 +20,7 @@ package org.apache.doris.common.proc;
import org.apache.doris.catalog.Database;
import org.apache.doris.catalog.Env;
import org.apache.doris.common.AnalysisException;
+import org.apache.doris.common.Config;
import org.apache.doris.common.FeConstants;
import org.apache.doris.datasource.InternalCatalog;
import org.apache.doris.transaction.GlobalTransactionMgr;
@@ -213,9 +214,9 @@ public class DbsProcDirTest {
"LastUpdateTime"), result.getColumnNames());
List<List<String>> rows = Lists.newArrayList();
rows.add(Arrays.asList(String.valueOf(db1.getId()), db1.getFullName(),
"0", "0.000 ", "8388608.000 TB",
- FeConstants.null_string, "0", "1073741824", "10", "1000",
FeConstants.null_string));
+ FeConstants.null_string, "0", "1073741824", "10",
String.valueOf(Config.max_running_txn_num_per_db), FeConstants.null_string));
rows.add(Arrays.asList(String.valueOf(db2.getId()), db2.getFullName(),
"0", "0.000 ", "8388608.000 TB",
- FeConstants.null_string, "0", "1073741824", "20", "1000",
FeConstants.null_string));
+ FeConstants.null_string, "0", "1073741824", "20",
String.valueOf(Config.max_running_txn_num_per_db), FeConstants.null_string));
Assert.assertEquals(rows, result.getRows());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
