SERVER-82810 dropAggTempCollections should accept NamespaceNotFound errors due to the db having been dropped

Author: jordist

jstests/noPassthrough/out_cleans_up_temp_collections_sharding.js

@@ -60,6 +60,11 @@ function failFn_killOp() {
     adminDB.killOp(curOps[0].opid);
 }
 
+function failFn_dropDbAndSigKill() {
+    testDB.dropDatabase();
+    failFn_sigkill();
+}
+
 function testFn(timeseries, failFn) {
     assert.eq(0, getTempCollections().length);
 
@@ -105,6 +110,10 @@ function testFn(timeseries, failFn) {
 jsTest.log("Running test with normal collection and SIGKILL");
 testFn(false, failFn_sigkill);
 
+jsTest.log("Running test with normal collection and dropDbAndSigKill");
+testFn(false, failFn_dropDbAndSigKill);
+assert.commandWorked(sourceColl.insert({x: 1}));
+
 jsTest.log("Running test with normal collection and killOp");
 testFn(false, failFn_killOp);
 

src/mongo/db/s/drop_agg_temp_collections.cpp

@@ -92,11 +92,15 @@ void dropAggTempCollections(OperationContext* opCtx) {
 
                 try {
                     dropTempCollection(opCtx.get(), nss);
+                } catch (const ExceptionFor<ErrorCodes::NamespaceNotFound>&) {
+                    // The database might have been dropped by a different operation, so the temp
+                    // collection does no longer exist.
                 } catch (const DBException& ex) {
                     LOGV2(8144400,
                           "Failed to drop temporary aggregation collection",
                           logAttrs(nss),
                           "error"_attr = redact(ex.toString()));
+                    // Do not remove the temporary collection entry.
                     continue;
                 }