SERVER-54191 Avoid fasserting in a tenant migration if recipient primary calls startup on oplog buffer after it steps down

3 files changed, 21 insertions, 9 deletions

diff --git a/src/mongo/db/repl/oplog_buffer_collection.cpp b/src/mongo/db/repl/oplog_buffer_collection.cpp
index e0343e6b9c1..fed20b125c1 100644
--- a/src/mongo/db/repl/oplog_buffer_collection.cpp
+++ b/src/mongo/db/repl/oplog_buffer_collection.cpp
@@ -419,12 +419,12 @@ void OplogBufferCollection::_createCollection(OperationContext* opCtx) {
     auto status = _storageInterface->createCollection(opCtx, _nss, options);
     if (status.code() == ErrorCodes::NamespaceExists)
         return;
-    fassert(40154, status);
+    uassertStatusOK(status);
 }
 
 void OplogBufferCollection::_dropCollection(OperationContext* opCtx) {
     UninterruptibleLockGuard noInterrupt(opCtx->lockState());
-    fassert(40155, _storageInterface->dropCollection(opCtx, _nss));
+    uassertStatusOK(_storageInterface->dropCollection(opCtx, _nss));
 }
 
 Timestamp OplogBufferCollection::getLastPushedTimestamp() const {
diff --git a/src/mongo/db/repl/oplog_buffer_collection_test.cpp b/src/mongo/db/repl/oplog_buffer_collection_test.cpp
index 6a5184ca117..35cdb2d89a8 100644
--- a/src/mongo/db/repl/oplog_buffer_collection_test.cpp
+++ b/src/mongo/db/repl/oplog_buffer_collection_test.cpp
@@ -149,11 +149,11 @@ TEST_F(OplogBufferCollectionTest, StartupWithUserProvidedNamespaceCreatesCollect
     testStartupCreatesCollection(_opCtx.get(), _storageInterface, makeNamespace(_agent));
 }
 
-DEATH_TEST_REGEX_F(
-    OplogBufferCollectionTest,
-    StartupWithOplogNamespaceTriggersFatalAssertion,
-    "Fatal assertion.*40154.*Location28838: cannot create a non-capped oplog collection") {
-    testStartupCreatesCollection(_opCtx.get(), _storageInterface, NamespaceString("local.oplog.Z"));
+TEST_F(OplogBufferCollectionTest, StartupWithOplogNamespaceTriggersUassert) {
+    ASSERT_THROWS_CODE(testStartupCreatesCollection(
+                           _opCtx.get(), _storageInterface, NamespaceString("local.oplog.Z")),
+                       DBException,
+                       28838);
 }
 
 TEST_F(OplogBufferCollectionTest, ShutdownDropsCollection) {
diff --git a/src/mongo/db/repl/tenant_migration_recipient_service.cpp b/src/mongo/db/repl/tenant_migration_recipient_service.cpp
index c8571ed76c8..c40612d3045 100644
--- a/src/mongo/db/repl/tenant_migration_recipient_service.cpp
+++ b/src/mongo/db/repl/tenant_migration_recipient_service.cpp
@@ -771,9 +771,21 @@ void TenantMigrationRecipientService::Instance::_startOplogFetcher() {
     options.useTemporaryCollection = false;
     stdx::unique_lock lk(_mutex);
     invariant(_stateDoc.getStartFetchingDonorOpTime());
+    auto oplogBufferNS = getOplogBufferNs(getMigrationUUID());
     _donorOplogBuffer = std::make_unique<OplogBufferCollection>(
-        StorageInterface::get(opCtx.get()), getOplogBufferNs(getMigrationUUID()), options);
-    _donorOplogBuffer->startup(opCtx.get());
+        StorageInterface::get(opCtx.get()), oplogBufferNS, options);
+
+    {
+        // Ensure we are primary when trying to startup and create the oplog buffer collection.
+        auto coordinator = repl::ReplicationCoordinator::get(opCtx.get());
+        Lock::GlobalLock globalLock(opCtx.get(), MODE_IX);
+        if (!coordinator->canAcceptWritesForDatabase(opCtx.get(), oplogBufferNS.db())) {
+            uassertStatusOK(
+                Status(ErrorCodes::NotWritablePrimary,
+                       "Recipient node is not primary, cannot create oplog buffer collection."));
+        }
+        _donorOplogBuffer->startup(opCtx.get());
+    }
 
     pauseAfterCreatingOplogBuffer.pauseWhileSet();