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 ff8b55485e6 branch-3.0: [Fix](compaction) Fix nullptr in
CloudStorageEngine due to concurrent access to compaction maps #50819 (#50881)
ff8b55485e6 is described below
commit ff8b55485e6f1458a98160ff033b4e82901731fc
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 14 21:58:29 2025 +0800
branch-3.0: [Fix](compaction) Fix nullptr in CloudStorageEngine due to
concurrent access to compaction maps #50819 (#50881)
Cherry-picked from #50819
Co-authored-by: abmdocrt <lianyuk...@selectdb.com>
---
be/src/cloud/cloud_storage_engine.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/be/src/cloud/cloud_storage_engine.cpp
b/be/src/cloud/cloud_storage_engine.cpp
index 01d9205a33a..668880be6df 100644
--- a/be/src/cloud/cloud_storage_engine.cpp
+++ b/be/src/cloud/cloud_storage_engine.cpp
@@ -688,6 +688,7 @@ Status
CloudStorageEngine::_submit_base_compaction_task(const CloudTabletSPtr& t
signal::tablet_id = tablet->tablet_id();
Defer defer {[&]() {
g_base_compaction_running_task_count << -1;
+ std::lock_guard lock(_compaction_mtx);
_submitted_base_compactions.erase(tablet->tablet_id());
DorisMetrics::instance()->base_compaction_task_running_total->increment(-1);
DorisMetrics::instance()->base_compaction_task_pending_total->set_value(
@@ -900,6 +901,7 @@ Status
CloudStorageEngine::_submit_full_compaction_task(const CloudTabletSPtr& t
signal::tablet_id = tablet->tablet_id();
Defer defer {[&]() {
g_full_compaction_running_task_count << -1;
+ std::lock_guard lock(_compaction_mtx);
_submitted_full_compactions.erase(tablet->tablet_id());
}};
auto st =
_request_tablet_global_compaction_lock(ReaderType::READER_FULL_COMPACTION,
tablet,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org
