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 c39b9d75d4e branch-3.1: [fix](cases) fix some failure cases #56019
(#56035)
c39b9d75d4e is described below
commit c39b9d75d4e055217d0cdfcb44f311b022c0ffb6
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed Sep 17 16:54:11 2025 +0800
branch-3.1: [fix](cases) fix some failure cases #56019 (#56035)
Cherry-picked from #56019
Co-authored-by: Yongqiang YANG <[email protected]>
---
be/src/olap/base_tablet.cpp | 2 ++
.../suites/compaction/test_config_prune_delete_sign.groovy | 8 +++++++-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/be/src/olap/base_tablet.cpp b/be/src/olap/base_tablet.cpp
index b56c424348a..9528220d349 100644
--- a/be/src/olap/base_tablet.cpp
+++ b/be/src/olap/base_tablet.cpp
@@ -1511,6 +1511,8 @@ Status BaseTablet::update_delete_bitmap(const
BaseTabletSPtr& self, TabletTxnInf
"BaseTablet::update_delete_bitmap.block");
if (block_dp) {
auto wait_token = block_dp->param<std::string>("wait_token",
"");
+ LOG(INFO) <<
"BaseTablet::update_delete_bitmap.enable_spin_wait, wait_token: "
+ << wait_token << ", token: " << token;
if (wait_token != token) {
break;
}
diff --git
a/regression-test/suites/compaction/test_config_prune_delete_sign.groovy
b/regression-test/suites/compaction/test_config_prune_delete_sign.groovy
index 67d75a1b66e..92f89f1066f 100644
--- a/regression-test/suites/compaction/test_config_prune_delete_sign.groovy
+++ b/regression-test/suites/compaction/test_config_prune_delete_sign.groovy
@@ -66,11 +66,17 @@ suite("test_config_prune_delete_sign", "nonConcurrent") {
qt_sql "select count() from ${table1};"
getDeleteSignCnt()
- (31..60).each {
+ (31..59).each {
sql "insert into ${table1} values($it,$it,$it);"
}
trigger_and_wait_compaction(table1, "cumulative")
+ // cloud base compaction does not include [0,1], after last cumulative
compaction,
+ // the base compacton would report -808, which means the base
compaction is not triggered.
+ // so we need to insert a row to make sure the base compaction happens.
+ sql "insert into ${table1} values(60,60,60);"
+ trigger_and_wait_compaction(table1, "cumulative")
+
def tablets = sql_return_maparray """ show tablets from ${table1}; """
logger.info("tablets: ${tablets}")
String compactionUrl = tablets[0]["CompactionStatus"]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
