Skip to content

fix(transaction): correct stale API usage in test_grpc_rpc_adapter breaking develop CI #6094

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
makr-code merged 2 commits into from
Aug 31, 2026
Merged

fix(transaction): correct stale API usage in test_grpc_rpc_adapter breaking develop CI #6094

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb31891
Initial plan
Copilot Aug 31, 2026
d607549
fix(transaction): fix build errors in test_grpc_rpc_adapter.cpp
Copilot Aug 31, 2026
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
26 changes: 13 additions & 13 deletions tests/transaction/test_grpc_rpc_adapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,9 @@ class MockParticipant : public IDistributedParticipantCallback {
// Helper: build a minimal DTM with a temp WAL
// ─────────────────────────────────────────────────────────────────────────────

static DistributedTransactionManagerConfig makeConfig() {
DistributedTransactionManagerConfig cfg;
cfg.wal_path = "/tmp/test_grpc_rpc_adapter_wal";
static DistributedTxnManagerConfig makeConfig() {
DistributedTxnManagerConfig cfg;
cfg.wal_directory = "/tmp/test_grpc_rpc_adapter_wal";
cfg.prepare_timeout = 200ms;
cfg.commit_timeout = 200ms;
return cfg;
Expand Down Expand Up @@ -156,7 +156,7 @@ TEST(GrpcRpcAdapterPhase1, VoteCommitOnSuccess) {
auto txn_id = dtm.beginDistributed({remote});
auto result = dtm.prepareDistributed(txn_id);

EXPECT_TRUE(result.ok()) << result.message();
EXPECT_TRUE(result.ok) << result.message;

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand All @@ -180,7 +180,7 @@ TEST(GrpcRpcAdapterPhase1, VoteAbortOnFailure) {
auto txn_id = dtm.beginDistributed({remote});
auto result = dtm.prepareDistributed(txn_id);

EXPECT_FALSE(result.ok());
EXPECT_FALSE(result.ok);

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand Down Expand Up @@ -218,7 +218,7 @@ TEST(GrpcRpcAdapterPhase1, VoteAbortOnTimeout) {
// (The exact result depends on thread scheduling; both ok() and !ok() are
// valid because the DTM may or may not have received the vote before its
// internal deadline; what matters is that the transaction is not stuck.)
EXPECT_FALSE(result.ok());
EXPECT_FALSE(result.ok);

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand Down Expand Up @@ -247,7 +247,7 @@ TEST(GrpcRpcAdapterPhase1, VoteAbortOnNetworkException) {
auto txn_id = dtm.beginDistributed({remote});
auto result = dtm.prepareDistributed(txn_id);

EXPECT_FALSE(result.ok());
EXPECT_FALSE(result.ok);

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand Down Expand Up @@ -389,7 +389,7 @@ TEST(GrpcRpcAdapterDtmIntegration, Phase1FnWiredAllCommit) {
auto txn_id = dtm.beginDistributed({r1, r2});
auto prep = dtm.prepareDistributed(txn_id);

EXPECT_TRUE(prep.ok()) << prep.message();
EXPECT_TRUE(prep.ok) << prep.message;

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand All @@ -410,7 +410,7 @@ TEST(GrpcRpcAdapterDtmIntegration, Phase1FnAbortVote) {
auto txn_id = dtm.beginDistributed({r});
auto prep = dtm.prepareDistributed(txn_id);

EXPECT_FALSE(prep.ok());
EXPECT_FALSE(prep.ok);

DistributedTransactionManager::clearRpcPhase1Fn();
DistributedTransactionManager::clearRpcPhase2Fn();
Expand All @@ -432,7 +432,7 @@ TEST(GrpcRpcAdapterDtmIntegration, Phase2FnDeliverCommit) {
dtm.prepareDistributed(txn_id);
auto commit = dtm.commitDistributed(txn_id);

EXPECT_TRUE(commit.ok()) << commit.message();
EXPECT_TRUE(commit.ok) << commit.message;
// Phase-2 fn must have been called with do_commit=true for node s4.
std::lock_guard<std::mutex> lk(rec.mu);
bool found = false;
Expand Down Expand Up @@ -467,9 +467,9 @@ TEST(GrpcRpcAdapterContention, SerialTransactionsDeterminism) {

auto txn_id = dtm.beginDistributed({r});
auto prep = dtm.prepareDistributed(txn_id);
if (prep.ok()) {
if (prep.ok) {
auto c = dtm.commitDistributed(txn_id);
if (c.ok()) ++committed;
if (c.ok) ++committed;
}
}

Expand Down Expand Up @@ -505,7 +505,7 @@ TEST(GrpcRpcAdapterWal, CommitDecisionDurableBeforePhase2) {
dtm.prepareDistributed(txn_id);
auto result = dtm.commitDistributed(txn_id);

EXPECT_TRUE(result.ok()) << result.message();
EXPECT_TRUE(result.ok) << result.message;
// Phase-2 fn should have been invoked.
EXPECT_TRUE(phase2_called.load());

Expand Down
Loading