This is an automated email from the ASF dual-hosted git repository.
dataroaring pushed a commit to branch branch-3.0
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.0 by this push:
new 7950af36c83 branch-3.0: [fix](cloud-mow) Make some timeout about mow
more reasonable #46365 (#47489)
7950af36c83 is described below
commit 7950af36c83cfaaf4f2b2cac6f4f209e7a040c55
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Jan 30 10:12:59 2025 +0800
branch-3.0: [fix](cloud-mow) Make some timeout about mow more reasonable
#46365 (#47489)
Cherry-picked from #46365
Co-authored-by: huanghaibin <huanghai...@selectdb.com>
---
be/src/common/config.cpp | 2 +-
fe/fe-common/src/main/java/org/apache/doris/common/Config.java | 4 ++--
fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/be/src/common/config.cpp b/be/src/common/config.cpp
index aefa3a5a2d3..1e7f0d12954 100644
--- a/be/src/common/config.cpp
+++ b/be/src/common/config.cpp
@@ -693,7 +693,7 @@ DEFINE_mBool(sync_file_on_close, "true");
DEFINE_mInt32(thrift_rpc_timeout_ms, "60000");
// txn commit rpc timeout
-DEFINE_mInt32(txn_commit_rpc_timeout_ms, "60000");
+DEFINE_mInt32(txn_commit_rpc_timeout_ms, "180000");
// If set to true, metric calculator will run
DEFINE_Bool(enable_metric_calculator, "true");
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 d221d8a9ad6..a7e781dd2a4 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
@@ -3186,8 +3186,8 @@ public class Config extends ConfigBase {
@ConfField(mutable = true, description = {"存算分离模式下fe向ms请求锁的过期时间，默认60s"})
public static int delete_bitmap_lock_expiration_seconds = 60;
- @ConfField(mutable = true, description = {"存算分离模式下calculate delete bitmap
task 超时时间，默认15s"})
- public static int calculate_delete_bitmap_task_timeout_seconds = 15;
+ @ConfField(mutable = true, description = {"存算分离模式下calculate delete bitmap
task 超时时间，默认60s"})
+ public static int calculate_delete_bitmap_task_timeout_seconds = 60;
@ConfField(mutable = true, description = {"存算分离模式下commit阶段等锁超时时间，默认5s"})
public static int try_commit_lock_timeout_seconds = 5;
diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
index fcff2697e5c..9e75c15dd46 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/SessionVariable.java
@@ -249,7 +249,7 @@ public class SessionVariable implements Serializable,
Writable {
public static final String ENABLE_INFER_PREDICATE =
"enable_infer_predicate";
- public static final long DEFAULT_INSERT_VISIBLE_TIMEOUT_MS = 10_000;
+ public static final long DEFAULT_INSERT_VISIBLE_TIMEOUT_MS = 60_000;
public static final String ENABLE_VECTORIZED_ENGINE =
"enable_vectorized_engine";
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
