SERVER-33160 syncApply() treats delete ops on non-existent namespaces as no-ops for idempotency reasons

2 files changed, 23 insertions, 18 deletions

diff --git a/src/mongo/db/repl/sync_tail.cpp b/src/mongo/db/repl/sync_tail.cpp
index 1f71d8b5b15..1600b99d224 100644
--- a/src/mongo/db/repl/sync_tail.cpp
+++ b/src/mongo/db/repl/sync_tail.cpp
@@ -360,24 +360,33 @@ Status SyncTail::syncApply(OperationContext* opCtx,
                 // it must have been in the same database or it would have gotten a new UUID.
                 // Need to throw instead of returning a status for it to be properly ignored.
                 actualNss = UUIDCatalog::get(opCtx).lookupNSSByUUID(statusWithUUID.getValue());
-                uassert(ErrorCodes::NamespaceNotFound,
-                        str::stream() << "Failed to apply operation due to missing collection ("
-                                      << statusWithUUID.getValue()
-                                      << "): "
-                                      << redact(op.toString()),
-                        !actualNss.isEmpty());
+                if (actualNss.isEmpty()) {
+                    if (opType[0] == 'd') {
+                        return Status::OK();
+                    }
+                    uasserted(ErrorCodes::NamespaceNotFound,
+                              str::stream()
+                                  << "Failed to apply operation due to missing collection ("
+                                  << statusWithUUID.getValue()
+                                  << "): "
+                                  << redact(op.toString()));
+                }
                 dassert(actualNss.db() == nss.db());
             }
             Lock::CollectionLock collLock(opCtx->lockState(), actualNss.ns(), MODE_IX);
 
             // Need to throw instead of returning a status for it to be properly ignored.
             Database* db = dbHolder().get(opCtx, actualNss.db());
-            uassert(ErrorCodes::NamespaceNotFound,
-                    str::stream() << "Failed to apply operation due to missing database ("
-                                  << actualNss.db()
-                                  << "): "
-                                  << redact(op.toString()),
-                    db);
+            if (!db) {
+                if (opType[0] == 'd') {
+                    return Status::OK();
+                }
+                uasserted(ErrorCodes::NamespaceNotFound,
+                          str::stream() << "Failed to apply operation due to missing database ("
+                                        << actualNss.db()
+                                        << "): "
+                                        << redact(op.toString()));
+            }
 
             OldClientContext ctx(opCtx, actualNss.ns(), db, /*justCreated*/ false);
             return applyOp(ctx.db());
diff --git a/src/mongo/db/repl/sync_tail_test.cpp b/src/mongo/db/repl/sync_tail_test.cpp
index c58f88b36cd..cea4e8652c9 100644
--- a/src/mongo/db/repl/sync_tail_test.cpp
+++ b/src/mongo/db/repl/sync_tail_test.cpp
@@ -306,9 +306,7 @@ TEST_F(SyncTailTest, SyncApplyDeleteDocumentDatabaseMissing) {
                             << "d"
                             << "ns"
                             << "test.othername");
-    ASSERT_THROWS_CODE(_testSyncApplyCrudOperation(ErrorCodes::OK, op, false),
-                       AssertionException,
-                       ErrorCodes::NamespaceNotFound);
+    _testSyncApplyCrudOperation(ErrorCodes::OK, op, false);
 }
 
 TEST_F(SyncTailTest, SyncApplyInsertDocumentCollectionLookupByUUIDFails) {
@@ -334,9 +332,7 @@ TEST_F(SyncTailTest, SyncApplyDeleteDocumentCollectionLookupByUUIDFails) {
                             << nss.getSisterNS("othername")
                             << "ui"
                             << UUID::gen());
-    ASSERT_THROWS_CODE(_testSyncApplyCrudOperation(ErrorCodes::OK, op, false),
-                       AssertionException,
-                       ErrorCodes::NamespaceNotFound);
+    _testSyncApplyCrudOperation(ErrorCodes::OK, op, false);
 }
 
 TEST_F(SyncTailTest, SyncApplyInsertDocumentCollectionMissing) {