SERVER-32148 Make NamespaceNotFound an acceptable error for emptyCapped and convertToCapped

Closes #1206

Signed-off-by: Siyuan Zhou <siyuan.zhou@mongodb.com>
(cherry picked from commit 35757e8ef3134fad1a09cb09a69882929d9ebb76)

4 files changed, 50 insertions, 10 deletions

diff --git a/jstests/replsets/emptycapped.js b/jstests/replsets/emptycapped.js
index 39a5c0eac56..f2d278dfb40 100644
--- a/jstests/replsets/emptycapped.js
+++ b/jstests/replsets/emptycapped.js
@@ -21,11 +21,13 @@
     // Truncate a non-existent collection on a non-existent database.
     assert.commandWorked(rst.getPrimary().getDB('nonexistent').dropDatabase());
     assert.commandFailedWithCode(
-        rst.getPrimary().getDB('nonexistent').runCommand({emptycapped: 'nonexistent'}), 13429);
+        rst.getPrimary().getDB('nonexistent').runCommand({emptycapped: 'nonexistent'}),
+        ErrorCodes.NamespaceNotFound);
 
     // Truncate a non-existent collection.
     primaryTestDB.nonexistent.drop();
-    assert.commandFailedWithCode(primaryTestDB.runCommand({emptycapped: 'nonexistent'}), 28584);
+    assert.commandFailedWithCode(primaryTestDB.runCommand({emptycapped: 'nonexistent'}),
+                                 ErrorCodes.NamespaceNotFound);
 
     // Truncate a capped collection.
     assert.commandWorked(primaryTestDB.createCollection("capped", {capped: true, size: 4096}));
diff --git a/src/mongo/db/catalog/capped_utils.cpp b/src/mongo/db/catalog/capped_utils.cpp
index e4039465a24..63b46d3c3a8 100644
--- a/src/mongo/db/catalog/capped_utils.cpp
+++ b/src/mongo/db/catalog/capped_utils.cpp
@@ -66,13 +66,13 @@ Status emptyCapped(OperationContext* txn, const NamespaceString& collectionName)
     }
 
     Database* db = autoDb.getDb();
-    massert(13429, "no such database", db);
+    uassert(ErrorCodes::NamespaceNotFound, "no such database", db);
 
     Collection* collection = db->getCollection(collectionName);
     uassert(ErrorCodes::CommandNotSupportedOnView,
             str::stream() << "emptycapped not supported on view: " << collectionName.ns(),
             collection || !db->getViewCatalog()->lookup(txn, collectionName.ns()));
-    massert(28584, "no such collection", collection);
+    uassert(ErrorCodes::NamespaceNotFound, "no such collection", collection);
 
     if (collectionName.isSystem() && !collectionName.isSystemDotProfile()) {
         return Status(ErrorCodes::IllegalOperation,
diff --git a/src/mongo/db/repl/oplog.cpp b/src/mongo/db/repl/oplog.cpp
index 76df271ed78..13769c5334d 100644
--- a/src/mongo/db/repl/oplog.cpp
+++ b/src/mongo/db/repl/oplog.cpp
@@ -658,12 +658,16 @@ std::map<std::string, ApplyOpMetadata> opsMap = {
           return applyOps(txn, nsToDatabase(ns), cmd, &resultWeDontCareAbout);
       },
       {ErrorCodes::UnknownError}}},
-    {"convertToCapped", {[](OperationContext* txn, const char* ns, BSONObj& cmd) -> Status {
-         return convertToCapped(txn, parseNs(ns, cmd), cmd["size"].number());
-     }}},
-    {"emptycapped", {[](OperationContext* txn, const char* ns, BSONObj& cmd) -> Status {
-         return emptyCapped(txn, parseNs(ns, cmd));
-     }}},
+    {"convertToCapped",
+     {[](OperationContext* txn, const char* ns, BSONObj& cmd) -> Status {
+          return convertToCapped(txn, parseNs(ns, cmd), cmd["size"].number());
+      },
+      {ErrorCodes::NamespaceNotFound}}},
+    {"emptycapped",
+     {[](OperationContext* txn, const char* ns, BSONObj& cmd) -> Status {
+          return emptyCapped(txn, parseNs(ns, cmd));
+      },
+      {ErrorCodes::NamespaceNotFound}}},
 };
 
 }  // namespace
diff --git a/src/mongo/db/repl/sync_tail_test.cpp b/src/mongo/db/repl/sync_tail_test.cpp
index 09953633f7e..f9fea88bf0b 100644
--- a/src/mongo/db/repl/sync_tail_test.cpp
+++ b/src/mongo/db/repl/sync_tail_test.cpp
@@ -1530,4 +1530,38 @@ TEST_F(IdempotencyTest, ResyncOnRenameCollection) {
     ASSERT_EQUALS(runOp(op), ErrorCodes::OplogOperationUnsupported);
 }
 
+TEST_F(IdempotencyTest, EmptyCappedNamespaceNotFound) {
+    // Create a BSON "emptycapped" command.
+    auto emptyCappedCmd = BSON("emptycapped" << nss.coll());
+
+    // Create an "emptycapped" oplog entry.
+    auto emptyCappedOp = makeCommandOplogEntry(nextOpTime(), nss, emptyCappedCmd);
+
+    // Ensure that NamespaceNotFound is acceptable.
+    ASSERT_OK(runOps({emptyCappedOp}));
+
+    AutoGetCollectionForRead autoColl(_opCtx.get(), nss);
+
+    // Ensure that autoColl.getCollection() and autoColl.getDb() are both null.
+    ASSERT_FALSE(autoColl.getCollection());
+    ASSERT_FALSE(autoColl.getDb());
+}
+
+TEST_F(IdempotencyTest, ConvertToCappedNamespaceNotFound) {
+    // Create a BSON "convertToCapped" command.
+    auto convertToCappedCmd = BSON("convertToCapped" << nss.coll());
+
+    // Create a "convertToCapped" oplog entry.
+    auto convertToCappedOp = makeCommandOplogEntry(nextOpTime(), nss, convertToCappedCmd);
+
+    // Ensure that NamespaceNotFound is acceptable.
+    ASSERT_OK(runOps({convertToCappedOp}));
+
+    AutoGetCollectionForRead autoColl(_opCtx.get(), nss);
+
+    // Ensure that autoColl.getCollection() and autoColl.getDb() are both null.
+    ASSERT_FALSE(autoColl.getCollection());
+    ASSERT_FALSE(autoColl.getDb());
+}
+
 }  // namespace