Skip to content

[chore](cloud) Fix txn_lazy_commit_test ut not stable #55717

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
merged 1 commit into from
Sep 6, 2025
Merged

[chore](cloud) Fix txn_lazy_commit_test ut not stable #55717

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
2 changes: 1 addition & 1 deletion cloud/src/recycler/recycler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1608,7 +1608,7 @@ int InstanceRecycler::recycle_tablets(int64_t table_id, int64_t index_id,
int64_t tablet_id = tablet_meta_pb.tablet_id();

if (!check_lazy_txn_finished(txn_kv_, instance_id_, tablet_meta_pb.tablet_id())) {
LOG(WARNING) << "lazy txn not finished tablet_meta_pb=" << tablet_meta_pb.tablet_id();
LOG(WARNING) << "lazy txn not finished tablet_id=" << tablet_meta_pb.tablet_id();
return -1;
}

Expand Down
9 changes: 4 additions & 5 deletions cloud/test/txn_lazy_commit_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ TEST(TxnLazyCommitTest, CommitTxnEventuallyWithoutDbIdTest) {
auto sp = SyncPoint::get_instance();
sp->set_call_back("commit_txn_eventually::need_repair_tablet_idx", [&](auto&& args) {
bool need_repair_tablet_idx = *try_any_cast<bool*>(args[0]);
LOG(INFO) << "zhangleixxx2" << need_repair_tablet_idx;
LOG(INFO) << "need_repair_tablet_idx:" << need_repair_tablet_idx;
if (repair_tablet_idx_count == 0) {
ASSERT_TRUE(need_repair_tablet_idx);
repair_tablet_idx_count++;
Expand Down Expand Up @@ -3300,10 +3300,10 @@ TEST(TxnLazyCommitTest, CommitTxnEventuallyWithHugeRowsetMetaTest) {
req.set_cloud_unique_id("test_cloud_unique_id");
TxnInfoPB txn_info_pb;
txn_info_pb.set_db_id(db_id);
txn_info_pb.set_label("test_label_multi_table_commit_txn");
txn_info_pb.set_label("test_label_with_huge_rowsetmeta_test");
txn_info_pb.add_table_ids(table_id);
txn_info_pb.add_table_ids(table_id2);
txn_info_pb.set_timeout_ms(36000);
txn_info_pb.set_timeout_ms(600000);
req.mutable_txn_info()->CopyFrom(txn_info_pb);
BeginTxnResponse res;
meta_service->begin_txn(reinterpret_cast<::google::protobuf::RpcController*>(&cntl), &req, &res,
Expand Down Expand Up @@ -3397,7 +3397,6 @@ TEST(TxnLazyCommitTest, CommitTxnEventuallyWithSchemaChangeTest) {

auto sp = SyncPoint::get_instance();
sp->set_call_back("TxnLazyCommitTask::make_committed_txn_visible::commit", [&](auto&& args) {
LOG(INFO) << "zhangleiyyy";
{
std::unique_lock<std::mutex> _lock(go_mutex);
if (make_committed_txn_visible_count == 0) {
Expand Down Expand Up @@ -3433,7 +3432,7 @@ TEST(TxnLazyCommitTest, CommitTxnEventuallyWithSchemaChangeTest) {
txn_info_pb.set_db_id(db_id);
txn_info_pb.set_label("test_sc_with_commit_txn_label");
txn_info_pb.add_table_ids(table_id);
txn_info_pb.set_timeout_ms(36000);
txn_info_pb.set_timeout_ms(600000);
req.mutable_txn_info()->CopyFrom(txn_info_pb);
BeginTxnResponse res;
meta_service->begin_txn(reinterpret_cast<::google::protobuf::RpcController*>(&cntl), &req, &res,
Expand Down