Update upstream source from tag 'upstream/6.0.10'debian/6.0.10-1

Update to upstream version '6.0.10'
with Debian dir 2d176fa254eee97b139f712fec5709641335a8c3

1 files changed, 9 insertions, 0 deletions

diff --git a/src/mongo/db/s/metadata_manager_test.cpp b/src/mongo/db/s/metadata_manager_test.cpp
index 2f39ef09147..b1936e3e47f 100644
--- a/src/mongo/db/s/metadata_manager_test.cpp
+++ b/src/mongo/db/s/metadata_manager_test.cpp
@@ -72,6 +72,12 @@ protected:
         orphanCleanupDelaySecs.store(1);
     }
 
+    void tearDown() override {
+        // Restore original `orphanCleanupDelaySecs` value for next unit tests
+        orphanCleanupDelaySecs.store(_defaultOrphanCleanupDelaySecs);
+        ShardServerTestFixture::tearDown();
+    }
+
     /**
      * Returns an instance of CollectionMetadata which has no chunks owned by 'thisShard'.
      */
@@ -184,6 +190,9 @@ protected:
     }
 
     std::shared_ptr<MetadataManager> _manager;
+
+private:
+    const int _defaultOrphanCleanupDelaySecs = orphanCleanupDelaySecs.load();
 };
 
 // The 'pending' field must not be set in order for a range deletion task to succeed, but the