SERVER-66455 Revert SERVER-58194 `ThreadContext` present as cleaning up `OpMsgFuzzerFixture`

1 files changed, 11 insertions, 18 deletions

diff --git a/src/mongo/db/op_msg_fuzzer_fixture.cpp b/src/mongo/db/op_msg_fuzzer_fixture.cpp
index 1b6172532ca..190e88e5988 100644
--- a/src/mongo/db/op_msg_fuzzer_fixture.cpp
+++ b/src/mongo/db/op_msg_fuzzer_fixture.cpp
@@ -126,24 +126,17 @@ OpMsgFuzzerFixture::OpMsgFuzzerFixture(bool skipGlobalInitializers)
 }
 
 OpMsgFuzzerFixture::~OpMsgFuzzerFixture() {
-    // The following ensures a thread-local instance of `ThreadContext` is available when running
-    // the destructor code. This is necessary as the main thread uses static storage for the
-    // instance of `OpMsgFuzzerFixture`, which is not destroyed until after all thread-locals are
-    // destructed. See SERVER-58194 for more details.
-    stdx::thread thread([this] {
-        CollectionShardingStateFactory::clear(_serviceContext);
-
-        {
-            auto clientGuard = _clientStrand->bind();
-            auto opCtx = _serviceContext->makeOperationContext(clientGuard.get());
-            Lock::GlobalLock glk(opCtx.get(), MODE_X);
-            auto databaseHolder = DatabaseHolder::get(opCtx.get());
-            databaseHolder->closeAll(opCtx.get());
-        }
-
-        shutdownGlobalStorageEngineCleanly(_serviceContext);
-    });
-    thread.join();
+    CollectionShardingStateFactory::clear(_serviceContext);
+
+    {
+        auto clientGuard = _clientStrand->bind();
+        auto opCtx = _serviceContext->makeOperationContext(clientGuard.get());
+        Lock::GlobalLock glk(opCtx.get(), MODE_X);
+        auto databaseHolder = DatabaseHolder::get(opCtx.get());
+        databaseHolder->closeAll(opCtx.get());
+    }
+
+    shutdownGlobalStorageEngineCleanly(_serviceContext);
 }
 
 int OpMsgFuzzerFixture::testOneInput(const char* Data, size_t Size) {