SERVER-61268 Fixing the release of a recoverable critical section

1 files changed, 6 insertions, 0 deletions

diff --git a/src/mongo/db/s/shard_server_op_observer.cpp b/src/mongo/db/s/shard_server_op_observer.cpp
index a8cf7b3ece1..9d7630c2e1d 100644
--- a/src/mongo/db/s/shard_server_op_observer.cpp
+++ b/src/mongo/db/s/shard_server_op_observer.cpp
@@ -538,6 +538,12 @@ void ShardServerOpObserver::onDelete(OperationContext* opCtx,
 
                     UninterruptibleLockGuard noInterrupt(opCtx->lockState());
                     auto* const csr = CollectionShardingRuntime::get(opCtx, deletedNss);
+
+                    // Secondary nodes must clear the filtering metadata before releasing the
+                    // in-memory critical section
+                    if (!isStandaloneOrPrimary(opCtx))
+                        csr->clearFilteringMetadata(opCtx);
+
                     auto csrLock = CollectionShardingRuntime::CSRLock::lockExclusive(opCtx, csr);
                     csr->exitCriticalSection(csrLock, reason);
                 });