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 df9fa9ce49f branch-3.0: [Fix](Compaction) Fix delete rowset sleeping
when compaction #51482 (#51553)
df9fa9ce49f is described below
commit df9fa9ce49f71599d239f293d4c9d92585254305
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sun Jun 8 20:32:45 2025 +0800
branch-3.0: [Fix](Compaction) Fix delete rowset sleeping when compaction
#51482 (#51553)
Cherry-picked from #51482
Co-authored-by: abmdocrt <[email protected]>
---
be/src/cloud/cloud_cumulative_compaction.cpp | 1 -
be/src/olap/cumulative_compaction.cpp | 1 -
be/src/olap/tablet.cpp | 3 ++-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/be/src/cloud/cloud_cumulative_compaction.cpp
b/be/src/cloud/cloud_cumulative_compaction.cpp
index 9fb70cb4efe..ae66ddb9433 100644
--- a/be/src/cloud/cloud_cumulative_compaction.cpp
+++ b/be/src/cloud/cloud_cumulative_compaction.cpp
@@ -51,7 +51,6 @@ Status CloudCumulativeCompaction::prepare_compact() {
Defer defer_set_st([&] {
if (!st.ok()) {
cloud_tablet()->set_last_cumu_compaction_status(st.to_string());
-
cloud_tablet()->set_last_cumu_compaction_failure_time(UnixMillis());
}
});
if (_tablet->tablet_state() != TABLET_RUNNING &&
diff --git a/be/src/olap/cumulative_compaction.cpp
b/be/src/olap/cumulative_compaction.cpp
index e76c3a78426..586efb9344f 100644
--- a/be/src/olap/cumulative_compaction.cpp
+++ b/be/src/olap/cumulative_compaction.cpp
@@ -83,7 +83,6 @@ Status CumulativeCompaction::prepare_compact() {
Defer defer_set_st([&] {
if (!st.ok()) {
tablet()->set_last_cumu_compaction_status(st.to_string());
- tablet()->set_last_cumu_compaction_failure_time(UnixMillis());
}
});
diff --git a/be/src/olap/tablet.cpp b/be/src/olap/tablet.cpp
index a0178a6bad5..9ff7ec74eda 100644
--- a/be/src/olap/tablet.cpp
+++ b/be/src/olap/tablet.cpp
@@ -1737,7 +1737,8 @@ Status Tablet::prepare_compaction_and_calculate_permits(
config::enable_sleep_between_delete_cumu_compaction) {
tablet->set_last_cumu_compaction_failure_time(UnixMillis());
}
- if (!res.is<CUMULATIVE_NO_SUITABLE_VERSION>()) {
+ if (!res.is<CUMULATIVE_NO_SUITABLE_VERSION>() &&
+ !res.is<ErrorCode::CUMULATIVE_MEET_DELETE_VERSION>()) {
DorisMetrics::instance()->cumulative_compaction_request_failed->increment(1);
return Status::InternalError("prepare cumulative compaction
with err: {}",
res.to_string());
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
