This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 85121c2b885 branch-4.1: [Fix](warmup) Fix wrong rowset data size when
calculating timeout of waiting delay compaction #61188 (#61460)
85121c2b885 is described below
commit 85121c2b885dcbc7327b36f1f5781720d1456553
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 18 17:34:15 2026 +0800
branch-4.1: [Fix](warmup) Fix wrong rowset data size when calculating
timeout of waiting delay compaction #61188 (#61460)
Cherry-picked from #61188
Co-authored-by: bobhan1 <[email protected]>
---
be/src/cloud/cloud_meta_mgr.cpp | 2 +-
be/src/cloud/config.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/be/src/cloud/cloud_meta_mgr.cpp b/be/src/cloud/cloud_meta_mgr.cpp
index 44ee033fb33..07514b7397f 100644
--- a/be/src/cloud/cloud_meta_mgr.cpp
+++ b/be/src/cloud/cloud_meta_mgr.cpp
@@ -1347,7 +1347,7 @@ Status CloudMetaMgr::commit_rowset(RowsetMeta& rs_meta,
const std::string& job_i
const double speed_mbps = 100.0; // 100MB/s
const double safety_factor = 2.0;
timeout_ms = std::min(
-
std::max(static_cast<int64_t>(static_cast<double>(rs_meta.data_disk_size()) /
+
std::max(static_cast<int64_t>(static_cast<double>(rs_meta.total_disk_size()) /
(speed_mbps * 1024 * 1024) *
safety_factor * 1000),
config::warm_up_rowset_sync_wait_min_timeout_ms),
config::warm_up_rowset_sync_wait_max_timeout_ms);
diff --git a/be/src/cloud/config.cpp b/be/src/cloud/config.cpp
index 673181846f1..669d9ac2041 100644
--- a/be/src/cloud/config.cpp
+++ b/be/src/cloud/config.cpp
@@ -128,7 +128,7 @@ DEFINE_mInt64(warm_up_rowset_slow_log_ms, "1000");
DEFINE_mBool(enable_compaction_delay_commit_for_warm_up, "false");
-DEFINE_mInt64(warm_up_rowset_sync_wait_min_timeout_ms, "10000");
+DEFINE_mInt64(warm_up_rowset_sync_wait_min_timeout_ms, "500");
DEFINE_mInt64(warm_up_rowset_sync_wait_max_timeout_ms, "120000");
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
