Skip to content

[fix](txn lazy commit) fix txn lazy commit conflict with schema change #55349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
Sep 1, 2025
Merged

[fix](txn lazy commit) fix txn lazy commit conflict with schema change #55349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion cloud/src/meta-service/txn_lazy_committer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,17 @@ void convert_tmp_rowsets(
LOG(INFO) << "txn_id=" << txn_id << " partition_id=" << tmp_rowset_pb.partition_id()
<< " version_pb:" << version_pb.ShortDebugString();
}

if (version_pb.pending_txn_ids_size() == 0 || version_pb.pending_txn_ids(0) != txn_id) {
LOG(INFO) << "txn_id=" << txn_id << " partition_id=" << tmp_rowset_pb.partition_id()
<< " tmp_rowset_key=" << hex(tmp_rowset_key)
<< " version has already been converted."
<< " version_pb:" << version_pb.ShortDebugString();
TEST_SYNC_POINT_CALLBACK("convert_tmp_rowsets::already_been_converted",
&version_pb);
return;
}

partition_versions.emplace(tmp_rowset_pb.partition_id(), version_pb);
DCHECK_EQ(partition_versions.size(), 1) << partition_versions.size();
}
Expand Down Expand Up @@ -460,7 +471,8 @@ void make_committed_txn_visible(const std::string& instance_id, int64_t db_id, i
txn->put(recycle_key, recycle_val);
LOG(INFO) << "put recycle_key=" << hex(recycle_key) << " txn_id=" << txn_id;
}

TEST_SYNC_POINT_RETURN_WITH_VOID("TxnLazyCommitTask::make_committed_txn_visible::commit",
&code);
err = txn->commit();
if (err != TxnErrorCode::TXN_OK) {
code = cast_as<ErrCategory::COMMIT>(err);
Expand Down
Loading