From c3e8c646bbf9e0ff8a5c4b91f1d4b0d79f255dfd Mon Sep 17 00:00:00 2001 From: huanghaibin Date: Thu, 30 Jan 2025 07:10:43 +0800 Subject: [PATCH] [fix](cloud-mow) Make some timeout about mow more reasonable (#46365) Now some timeout config is not suitable for high concurrency loading on Mow table, which may lead to frequent lock timeouts. --- be/src/common/config.cpp | 2 +- .../src/main/java/org/apache/doris/common/Config.java | 4 ++-- .../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 267a12c0ecc99b..699ffcfe95aa8d 100644 --- a/be/src/common/config.cpp +++ b/be/src/common/config.cpp @@ -682,7 +682,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 24f9bd48682557..1d971b93dda58a 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 @@ -3277,8 +3277,8 @@ public static int metaServiceRpcRetryTimes() { @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 = {"存算分离模式下事务导入calculate delete bitmap task 超时时间，默认300s"}) public static int calculate_delete_bitmap_task_timeout_seconds_for_transaction_load = 300; 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 3296396520ad92..ba4fa429dd9e67 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 @@ -253,7 +253,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";