[Fix](cloud-mow) Compaciton should release delete bitmap lock when abort fail #47766
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1404,7 +1404,12 @@ int64_t CloudCompactionMixin::get_compaction_permits() { | |
|
|
||
| CloudCompactionMixin::CloudCompactionMixin(CloudStorageEngine& engine, CloudTabletSPtr tablet, | ||
| const std::string& label) | ||
| : Compaction(tablet, label), _engine(engine) { | ||
| auto uuid = UUIDGenerator::instance()->next_uuid(); | ||
| std::stringstream ss; | ||
| ss << uuid; | ||
| _uuid = ss.str(); | ||
| } | ||
|
|
||
| Status CloudCompactionMixin::execute_compact_impl(int64_t permits) { | ||
| OlapStopWatch watch; | ||
|
|
@@ -1439,11 +1444,26 @@ Status CloudCompactionMixin::execute_compact_impl(int64_t permits) { | |
| return Status::OK(); | ||
| } | ||
|
|
||
| int64_t CloudCompactionMixin::initiator() const { | ||
| return HashUtil::hash64(_uuid.data(), _uuid.size(), 0) & std::numeric_limits<int64_t>::max(); | ||
| } | ||
|
|
||
| Status CloudCompactionMixin::execute_compact() { | ||
| TEST_INJECTION_POINT("Compaction::do_compaction"); | ||
| int64_t permits = get_compaction_permits(); | ||
| HANDLE_EXCEPTION_IF_CATCH_EXCEPTION( | ||
| execute_compact_impl(permits), [&](const doris::Exception& ex) { | ||
| auto st = garbage_collection(); | ||
| if (!st.ok() && initiator() != INVALID_COMPACTION_INITIATOR_ID) { | ||
| // if compaction fail, be will try to abort compaction, and delete bitmap lock | ||
| // will release if abort job successfully, but if abort failed, delete bitmap | ||
| // lock will not release, in this situation, be need to send this rpc to ms | ||
| // to try to release delete bitmap lock. | ||
| _engine.meta_mgr().remove_delete_bitmap_update_lock( | ||
|
Contributor
There was a problem hiding this comment. "If the RPC to release the lock fails here, will the lock still not be released?"
Contributor
Author
There was a problem hiding this comment. Yes, this pr just try to release lock, it may fail on TXN_KV_CONFICT, this problem has existed for a long time, if release rpc fail, this lock will be released when lock is expired.
Contributor
There was a problem hiding this comment. @luwei16 It's ok if the rpc failed to release lock here, it's the same with rpc failed on commit phase. |
||
| _tablet->table_id(), COMPACTION_DELETE_BITMAP_LOCK_ID, initiator(), | ||
| _tablet->tablet_id()); | ||
| } | ||
| }); | ||
| _load_segment_to_cache(); | ||
| return Status::OK(); | ||
| } | ||
|
|
@@ -1488,9 +1508,9 @@ Status CloudCompactionMixin::construct_output_rowset_writer(RowsetWriterContext& | |
| return Status::OK(); | ||
| } | ||
|
|
||
| Status CloudCompactionMixin::garbage_collection() { | ||
| if (!config::enable_file_cache) { | ||
| return Status::OK(); | ||
| } | ||
| if (_output_rs_writer) { | ||
| auto* beta_rowset_writer = dynamic_cast<BaseBetaRowsetWriter*>(_output_rs_writer.get()); | ||
|
|
@@ -1501,6 +1521,7 @@ void CloudCompactionMixin::garbage_collection() { | |
| file_cache->remove_if_cached_async(file_key); | ||
| } | ||
| } | ||
| return Status::OK(); | ||
| } | ||
|
|
||
| void CloudCompactionMixin::update_compaction_level() { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why not return the status?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
remove_delete_bitmap_update_lock just try to release lock, some times it may fail, like lock id not found beacause lock is expired and loading task has already taken the lock, in this situation, we can do nothing, just print a warnning lock is enought, so no need to return a wrong statu