This is an automated email from the ASF dual-hosted git repository.
csun5285 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/master by this push:
new 0f88df67964 [fix](test) fix flaky test_time_series_compaction_level2
(#64663)
0f88df67964 is described below
commit 0f88df67964c2b3b907dba616827d18ab376111b
Author: Chenyang Sun <[email protected]>
AuthorDate: Mon Jun 22 19:44:50 2026 +0800
[fix](test) fix flaky test_time_series_compaction_level2 (#64663)
fix flaky test_time_series_compaction_level2
---
.../storage/compaction/cumulative_compaction_time_series_policy.cpp | 4 +++-
.../suites/compaction/test_time_series_compaction_level2.groovy | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git
a/be/src/storage/compaction/cumulative_compaction_time_series_policy.cpp
b/be/src/storage/compaction/cumulative_compaction_time_series_policy.cpp
index ed41d771f41..ab23c43904e 100644
--- a/be/src/storage/compaction/cumulative_compaction_time_series_policy.cpp
+++ b/be/src/storage/compaction/cumulative_compaction_time_series_policy.cpp
@@ -372,13 +372,15 @@ int32_t
TimeSeriesCumulativeCompactionPolicy::pick_input_rowsets(
if (compaction_level >= 2) {
int64_t continuous_size = 0;
std::vector<RowsetSharedPtr> level1_rowsets;
+ int64_t level2_compaction_timeout = MAX_LEVEL2_COMPACTION_TIMEOUT;
+ DBUG_EXECUTE_IF("time_series_level2_file_count", {
level2_compaction_timeout = -1; });
for (const auto& rowset : candidate_rowsets) {
const auto& rs_meta = rowset->rowset_meta();
if (rs_meta->compaction_level() == 0) {
break;
}
if (rs_meta->compaction_level() == 1 &&
- (now - rs_meta->creation_time()) <=
MAX_LEVEL2_COMPACTION_TIMEOUT) {
+ (now - rs_meta->creation_time()) <= level2_compaction_timeout)
{
continue;
}
level1_rowsets.push_back(rowset);
diff --git
a/regression-test/suites/compaction/test_time_series_compaction_level2.groovy
b/regression-test/suites/compaction/test_time_series_compaction_level2.groovy
index 8604be712c0..83f583ba408 100644
---
a/regression-test/suites/compaction/test_time_series_compaction_level2.groovy
+++
b/regression-test/suites/compaction/test_time_series_compaction_level2.groovy
@@ -133,7 +133,7 @@ suite("test_time_series_compaction_level2",
"nonConcurrent") {
wait_cumulative_compaction_done.call(tablets)
rowsetCount = get_rowset_count.call(tablets);
- assert (rowsetCount == 1 + 1)
+ assert (rowsetCount == 1 + 1) : "10 level-1 rowsets should be level-2
compacted into 1; expected 2 rowsets, got ${rowsetCount}"
} finally {
GetDebugPoint().disableDebugPointForAllBEs("time_series_level2_file_count")
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
