SERVER-34571 Ensure _deleteNotifyExec in MigrationChunkClonerSourceLegacy always reset on cleanup

(cherry picked from commit 179985c786cea234b65946ff647debfdfdbed511)

1 files changed, 7 insertions, 2 deletions

diff --git a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp
index ea83fa83d0d..35520a22c10 100644
--- a/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp
+++ b/src/mongo/db/s/migration_chunk_cloner_source_legacy.cpp
@@ -473,12 +473,17 @@ void MigrationChunkClonerSourceLegacy::_cleanup(OperationContext* txn) {
         _reload.clear();
         _deleted.clear();
     }
+    // Implicitly resets _deleteNotifyExec to avoid possible invariant failure
+    // in on destruction of MigrationChunkClonerSourceLegacy, and will always
+    // call deleteNotifyExec destructor on scope exit even if something in the
+    // below if statement fails
+    auto deleteNotifyExec = std::move(_deleteNotifyExec);
 
-    if (_deleteNotifyExec) {
+    if (deleteNotifyExec) {
         ScopedTransaction scopedXact(txn, MODE_IS);
         AutoGetCollection autoColl(txn, _args.getNss(), MODE_IS);
 
-        _deleteNotifyExec.reset();
+        deleteNotifyExec.reset();
     }
 }