Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions be/src/storage/tablet/tablet.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3268,8 +3268,7 @@ Status Tablet::prepare_txn(TPartitionId partition_id, TTransactionId transaction
}

std::lock_guard<std::mutex> push_lock(get_push_lock());
return _engine.txn_manager()->prepare_txn(partition_id, transaction_id, tablet_id(),
tablet_uid(), load_id, ingest);
return _engine.txn_manager()->prepare_txn(partition_id, *this, transaction_id, load_id, ingest);
Comment thread
deardeng marked this conversation as resolved.
Comment thread
deardeng marked this conversation as resolved.
}

} // namespace doris
14 changes: 14 additions & 0 deletions be/test/storage/txn/txn_manager_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,20 @@ TEST_F(TxnManagerTest, PrepareNewTxn) {
EXPECT_TRUE(status == Status::OK());
}

TEST_F(TxnManagerTest, PrepareTxnRejectsOldShutdownTablet) {
auto tablet = k_engine->tablet_manager()->get_tablet(tablet_id);
ASSERT_NE(tablet, nullptr);
ASSERT_TRUE(tablet->set_tablet_state(TABLET_SHUTDOWN).ok());

auto status = tablet->prepare_txn(partition_id, transaction_id, load_id, false);
EXPECT_FALSE(status.ok()) << status;

std::map<TabletInfo, RowsetSharedPtr> related_tablets;
k_engine->txn_manager()->get_txn_related_tablets(transaction_id, partition_id,
&related_tablets);
EXPECT_TRUE(related_tablets.empty());
}

// 1. prepare txn
// 2. commit txn
// 3. should be success
Expand Down
Loading