summaryrefslogtreecommitdiff
path: root/src/mongo/db/repl/oplog_applier_impl_test.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/db/repl/oplog_applier_impl_test.cpp')
-rw-r--r--src/mongo/db/repl/oplog_applier_impl_test.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/mongo/db/repl/oplog_applier_impl_test.cpp b/src/mongo/db/repl/oplog_applier_impl_test.cpp
index f9c41a19877..072c2a24464 100644
--- a/src/mongo/db/repl/oplog_applier_impl_test.cpp
+++ b/src/mongo/db/repl/oplog_applier_impl_test.cpp
@@ -44,7 +44,6 @@
#include "mongo/db/client.h"
#include "mongo/db/commands/feature_compatibility_version_parser.h"
#include "mongo/db/concurrency/d_concurrency.h"
-#include "mongo/db/concurrency/write_conflict_exception.h"
#include "mongo/db/curop.h"
#include "mongo/db/db_raii.h"
#include "mongo/db/dbdirectclient.h"
@@ -422,11 +421,14 @@ TEST_F(OplogApplierImplTest, applyOplogEntryToRecordChangeStreamPreImages) {
}
};
generateTestCasesForOperations(OplogApplication::Mode::kSecondary, {}, true);
- generateTestCasesForOperations(OplogApplication::Mode::kRecovering, {}, true);
+ generateTestCasesForOperations(OplogApplication::Mode::kUnstableRecovering, {}, true);
+ generateTestCasesForOperations(OplogApplication::Mode::kStableRecovering, {}, true);
generateTestCasesForOperations(OplogApplication::Mode::kInitialSync, {}, false);
const auto kFromMigrate{true};
generateTestCasesForOperations(OplogApplication::Mode::kSecondary, kFromMigrate, false);
- generateTestCasesForOperations(OplogApplication::Mode::kRecovering, kFromMigrate, false);
+ generateTestCasesForOperations(
+ OplogApplication::Mode::kUnstableRecovering, kFromMigrate, false);
+ generateTestCasesForOperations(OplogApplication::Mode::kStableRecovering, kFromMigrate, false);
generateTestCasesForOperations(OplogApplication::Mode::kInitialSync, kFromMigrate, false);
int docId{0};
@@ -860,7 +862,7 @@ TEST_F(MultiOplogEntryOplogApplierImplTest, MultiApplyUnpreparedTransactionAllAt
ReplicationCoordinator::get(_opCtx.get()),
getConsistencyMarkers(),
getStorageInterface(),
- repl::OplogApplier::Options(repl::OplogApplication::Mode::kRecovering),
+ repl::OplogApplier::Options(repl::OplogApplication::Mode::kStableRecovering),
_writerPool.get());
// Apply both inserts and the commit in a single batch. We expect no oplog entries to
@@ -1342,7 +1344,7 @@ TEST_F(MultiOplogEntryPreparedTransactionTest, MultiApplyPreparedTransactionReco
ReplicationCoordinator::get(_opCtx.get()),
getConsistencyMarkers(),
getStorageInterface(),
- repl::OplogApplier::Options(repl::OplogApplication::Mode::kRecovering),
+ repl::OplogApplier::Options(repl::OplogApplication::Mode::kStableRecovering),
_writerPool.get());
// Apply a batch with the insert operations. This should have no effect, because this is
@@ -1576,7 +1578,7 @@ TEST_F(MultiOplogEntryPreparedTransactionTest,
ReplicationCoordinator::get(_opCtx.get()),
getConsistencyMarkers(),
getStorageInterface(),
- repl::OplogApplier::Options(repl::OplogApplication::Mode::kRecovering),
+ repl::OplogApplier::Options(repl::OplogApplication::Mode::kStableRecovering),
_writerPool.get());
const auto expectedStartOpTime = _singlePrepareApplyOp->getOpTime();