SERVER-82811 ShardsvrProcessInterface::dropCollection should accept NamespaceNotFound errors due to the database having been dropped

Author: jordist

jstests/noPassthrough/out_cleans_up_temp_collections_sharding.js

@@ -65,6 +65,11 @@ function failFn_dropDbAndSigKill() {
     failFn_sigkill();
 }
 
+function failFn_dropDbAndKillOp() {
+    testDB.dropDatabase();
+    failFn_killOp();
+}
+
 function testFn(timeseries, failFn) {
     assert.eq(0, getTempCollections().length);
 
@@ -117,6 +122,10 @@ assert.commandWorked(sourceColl.insert({x: 1}));
 jsTest.log("Running test with normal collection and killOp");
 testFn(false, failFn_killOp);
 
+jsTest.log("Running test with normal collection and dropDbAndkillOp");
+testFn(false, failFn_dropDbAndKillOp);
+assert.commandWorked(sourceColl.insert({x: 1}));
+
 jsTest.log("Running test with timeseries collection and SIGKILL");
 testFn(true, failFn_sigkill);
 

src/mongo/db/pipeline/process_interface/shardsvr_process_interface.cpp

@@ -459,29 +459,36 @@ void ShardServerProcessInterface::dropCollection(OperationContext* opCtx,
     // Build and execute the _shardsvrDropCollection command against the primary shard of the given
     // database.
     sharding::router::DBPrimaryRouter router(opCtx->getServiceContext(), ns.dbName());
-    router.route(
-        opCtx,
-        "ShardServerProcessInterface::dropCollection",
-        [&](OperationContext* opCtx, const CachedDatabaseInfo& cdb) {
-            ShardsvrDropCollection dropCollectionCommand(ns);
-            BSONObj cmdObj = CommandHelpers::appendMajorityWriteConcern(
-                dropCollectionCommand.toBSON({}), opCtx->getWriteConcern());
-            auto response = executeCommandAgainstDatabasePrimary(
-                opCtx,
-                ns.dbName(),
-                cdb,
-                cmdObj,
-                ReadPreferenceSetting(ReadPreference::PrimaryOnly),
-                Shard::RetryPolicy::kIdempotent);
-            uassertStatusOKWithContext(response.swResponse,
-                                       str::stream() << "failed while running command " << cmdObj);
-            auto result = response.swResponse.getValue().data;
-            uassertStatusOKWithContext(getStatusFromCommandResult(result),
-                                       str::stream() << "failed while running command " << cmdObj);
-            uassertStatusOKWithContext(
-                getWriteConcernStatusFromCommandResult(result),
-                str::stream() << "write concern failed while running command " << cmdObj);
-        });
+    try {
+        router.route(opCtx,
+                     "ShardServerProcessInterface::dropCollection",
+                     [&](OperationContext* opCtx, const CachedDatabaseInfo& cdb) {
+                         ShardsvrDropCollection dropCollectionCommand(ns);
+                         BSONObj cmdObj = CommandHelpers::appendMajorityWriteConcern(
+                             dropCollectionCommand.toBSON({}), opCtx->getWriteConcern());
+                         auto response = executeCommandAgainstDatabasePrimary(
+                             opCtx,
+                             ns.dbName(),
+                             cdb,
+                             cmdObj,
+                             ReadPreferenceSetting(ReadPreference::PrimaryOnly),
+                             Shard::RetryPolicy::kIdempotent);
+                         uassertStatusOKWithContext(response.swResponse,
+                                                    str::stream() << "failed while running command "
+                                                                  << cmdObj);
+                         auto result = response.swResponse.getValue().data;
+                         uassertStatusOKWithContext(getStatusFromCommandResult(result),
+                                                    str::stream() << "failed while running command "
+                                                                  << cmdObj);
+                         uassertStatusOKWithContext(
+                             getWriteConcernStatusFromCommandResult(result),
+                             str::stream()
+                                 << "write concern failed while running command " << cmdObj);
+                     });
+    } catch (const ExceptionFor<ErrorCodes::NamespaceNotFound>&) {
+        // The database might have been dropped by a different operation, so the collection no
+        // longer exists.
+    }
 }
 
 void ShardServerProcessInterface::dropTempCollection(OperationContext* opCtx,