diff options
| author | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
|---|---|---|
| committer | Lucas de Castro Borges <lucas@gnuabordo.com.br> | 2025-02-11 15:07:35 -0300 |
| commit | 4cb8841196d0625dfa3825aa326f071cd27c7b8b (patch) | |
| tree | 1682a647d4463397c119183369ae6f750d5fdcff /src/mongo/db/transaction_api_test.cpp | |
| parent | aa03c6362cbaa767638e6eed9b031d86dd2643d1 (diff) | |
| parent | 8f0827553e09872941945a093b647a4211a9db7f (diff) | |
Update upstream source from tag 'upstream/6.0.0'master
Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322
Diffstat (limited to 'src/mongo/db/transaction_api_test.cpp')
| -rw-r--r-- | src/mongo/db/transaction_api_test.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mongo/db/transaction_api_test.cpp b/src/mongo/db/transaction_api_test.cpp index 90a8daf4366..bcfb8ba5815 100644 --- a/src/mongo/db/transaction_api_test.cpp +++ b/src/mongo/db/transaction_api_test.cpp @@ -1203,7 +1203,6 @@ TEST_F(TxnAPITest, UnyieldsAfterCancellation) { auto killerThread = stdx::thread([&txnApiStarted, &opCtxKilled, opCtx = opCtx()] { txnApiStarted.countDownAndWait(); opCtx->markKilled(); - opCtxKilled.countDownAndWait(); }); auto swResult = txnWithRetries().runNoThrow( @@ -1231,7 +1230,11 @@ TEST_F(TxnAPITest, UnyieldsAfterCancellation) { ASSERT_EQ(resourceYielder()->timesYielded(), 1); ASSERT_EQ(resourceYielder()->timesUnyielded(), 1); + opCtxKilled.countDownAndWait(); killerThread.join(); + + // Wait until the API callback has completed before letting the barriers go out of scope. + waitForAllEarlierTasksToComplete(); } TEST_F(TxnAPITest, ClientSession_UsesNonRetryableInternalSession) { |