SERVER-56956 ScopedShardVersionCriticalSection can leave critical section held if filtering metadata refresh fails

2 files changed, 20 insertions, 9 deletions

diff --git a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
index 7f7541a4b79..6a04f9b916b 100644
--- a/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
+++ b/src/mongo/db/s/shard_filtering_metadata_refresh.cpp
@@ -318,18 +318,16 @@ ScopedShardVersionCriticalSection::ScopedShardVersionCriticalSection(OperationCo
         }
     }
 
-    forceShardFilteringMetadataRefresh(_opCtx, _nss);
+    try {
+        forceShardFilteringMetadataRefresh(_opCtx, _nss);
+    } catch (const DBException&) {
+        _cleanup();
+        throw;
+    }
 }
 
 ScopedShardVersionCriticalSection::~ScopedShardVersionCriticalSection() {
-    UninterruptibleLockGuard noInterrupt(_opCtx->lockState());
-    // DBLock and CollectionLock are used here to avoid throwing further recursive stale config
-    // errors.
-    Lock::DBLock dbLock(_opCtx, _nss.db(), MODE_IX);
-    Lock::CollectionLock collLock(_opCtx, _nss, MODE_IX);
-    auto* const csr = CollectionShardingRuntime::get(_opCtx, _nss);
-    auto csrLock = CollectionShardingRuntime::CSRLock::lockExclusive(_opCtx, csr);
-    csr->exitCriticalSection(csrLock, _reason);
+    _cleanup();
 }
 
 void ScopedShardVersionCriticalSection::enterCommitPhase() {
@@ -344,6 +342,17 @@ void ScopedShardVersionCriticalSection::enterCommitPhase() {
     csr->enterCriticalSectionCommitPhase(csrLock, _reason);
 }
 
+void ScopedShardVersionCriticalSection::_cleanup() {
+    UninterruptibleLockGuard noInterrupt(_opCtx->lockState());
+    // DBLock and CollectionLock are used here to avoid throwing further recursive stale config
+    // errors.
+    Lock::DBLock dbLock(_opCtx, _nss.db(), MODE_IX);
+    Lock::CollectionLock collLock(_opCtx, _nss, MODE_IX);
+    auto* const csr = CollectionShardingRuntime::get(_opCtx, _nss);
+    auto csrLock = CollectionShardingRuntime::CSRLock::lockExclusive(_opCtx, csr);
+    csr->exitCriticalSection(csrLock, _reason);
+}
+
 Status onShardVersionMismatchNoExcept(OperationContext* opCtx,
                                       const NamespaceString& nss,
                                       boost::optional<ChunkVersion> shardVersionReceived) noexcept {
diff --git a/src/mongo/db/s/shard_filtering_metadata_refresh.h b/src/mongo/db/s/shard_filtering_metadata_refresh.h
index 3801654aace..8ebec832d75 100644
--- a/src/mongo/db/s/shard_filtering_metadata_refresh.h
+++ b/src/mongo/db/s/shard_filtering_metadata_refresh.h
@@ -119,6 +119,8 @@ public:
     void enterCommitPhase();
 
 private:
+    void _cleanup();
+
     OperationContext* const _opCtx;
     const NamespaceString _nss;
     const BSONObj _reason;