From 22297abd0b885a12be4f27ae8db7f12ff5ac52c0 Mon Sep 17 00:00:00 2001 From: Tanya-W Date: Tue, 15 Aug 2023 16:36:29 +0800 Subject: [PATCH 1/2] [fix](inverted index change) make mutex for ALTER_INVERTED_INDEX task and STORAGE_MEDIUM_MIGRATE task --- be/src/olap/task/index_builder.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/be/src/olap/task/index_builder.cpp b/be/src/olap/task/index_builder.cpp index 67e39104c6fbc9..54b6146e02a3de 100644 --- a/be/src/olap/task/index_builder.cpp +++ b/be/src/olap/task/index_builder.cpp @@ -398,6 +398,12 @@ Status IndexBuilder::do_build_inverted_index() { "failed to obtain build inverted index lock. tablet={}", _tablet->tablet_id()); } + std::shared_lock migration_rlock(_tablet->get_migration_lock(), std::try_to_lock); + if (!migration_rlock.owns_lock()) { + return Status::Error( + "got migration_rlock failed. tablet={}", _tablet->full_name()); + } + _input_rowsets = _tablet->pick_candidate_rowsets_to_build_inverted_index(_alter_index_ids, _is_drop_op); if (_input_rowsets.empty()) { From 20dc52cf59a26fbce02ff41f09587154818a9cbd Mon Sep 17 00:00:00 2001 From: Tanya-W Date: Tue, 15 Aug 2023 17:02:23 +0800 Subject: [PATCH 2/2] fix code format --- be/src/olap/task/index_builder.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/be/src/olap/task/index_builder.cpp b/be/src/olap/task/index_builder.cpp index 54b6146e02a3de..147d9c7b93b66d 100644 --- a/be/src/olap/task/index_builder.cpp +++ b/be/src/olap/task/index_builder.cpp @@ -400,8 +400,8 @@ Status IndexBuilder::do_build_inverted_index() { std::shared_lock migration_rlock(_tablet->get_migration_lock(), std::try_to_lock); if (!migration_rlock.owns_lock()) { - return Status::Error( - "got migration_rlock failed. tablet={}", _tablet->full_name()); + return Status::Error("got migration_rlock failed. tablet={}", + _tablet->full_name()); } _input_rowsets =