This is an automated email from the ASF dual-hosted git repository.
dataroaring 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 73ca1e82df7 [fix](compaction) Filter out all not running tablets if
cumu compaction for shadow tablets is disabled (#42245)
73ca1e82df7 is described below
commit 73ca1e82df7626518ee6369be4e0c87ddc62df41
Author: Siyang Tang <82279870+tangsiyang2...@users.noreply.github.com>
AuthorDate: Wed Oct 23 12:39:23 2024 +0800
[fix](compaction) Filter out all not running tablets if cumu compaction for
shadow tablets is disabled (#42245)
## Proposed changes
As title. If cumu compaction for shadow tablets is disabled, shadow
tablets may be picked to do cumu compaction and result in error status.
---
be/src/cloud/cloud_storage_engine.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/be/src/cloud/cloud_storage_engine.cpp
b/be/src/cloud/cloud_storage_engine.cpp
index 4f452656a62..5d7b445917a 100644
--- a/be/src/cloud/cloud_storage_engine.cpp
+++ b/be/src/cloud/cloud_storage_engine.cpp
@@ -558,14 +558,16 @@ std::vector<CloudTabletSPtr>
CloudStorageEngine::_generate_cloud_compaction_task
} else if (config::enable_parallel_cumu_compaction) {
filter_out = [&tablet_preparing_cumu_compaction](CloudTablet* t) {
return tablet_preparing_cumu_compaction.contains(t->tablet_id()) ||
- (t->tablet_state() != TABLET_RUNNING && t->alter_version()
== -1);
+ (t->tablet_state() != TABLET_RUNNING &&
+ (!config::enable_new_tablet_do_compaction ||
t->alter_version() == -1));
};
} else {
filter_out = [&tablet_preparing_cumu_compaction,
&submitted_cumu_compactions](CloudTablet* t) {
return tablet_preparing_cumu_compaction.contains(t->tablet_id()) ||
submitted_cumu_compactions.contains(t->tablet_id()) ||
- (t->tablet_state() != TABLET_RUNNING && t->alter_version()
== -1);
+ (t->tablet_state() != TABLET_RUNNING &&
+ (!config::enable_new_tablet_do_compaction ||
t->alter_version() == -1));
};
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
