SERVER-15901: Correctly finalize the ThreadOstreamCache in unittests

1 files changed, 11 insertions, 0 deletions

diff --git a/src/mongo/logger/logstream_builder.cpp b/src/mongo/logger/logstream_builder.cpp
index 348d6acbcba..cc3135ec59b 100644
--- a/src/mongo/logger/logstream_builder.cpp
+++ b/src/mongo/logger/logstream_builder.cpp
@@ -62,6 +62,17 @@ namespace {
     TSP_DECLARE(OwnedOstreamVector, threadOstreamCache);
     TSP_DEFINE(OwnedOstreamVector, threadOstreamCache);
 
+namespace {
+    // During unittests, where we don't use quickExit(), static finalization may destroy the
+    // cache before its last use, so mark it as not initialized in that case.
+    // This must be after the TSP_DEFINE so that it is destroyed first.
+    struct ThreadOstreamCacheFinalizer {
+        ~ThreadOstreamCacheFinalizer() {
+            isThreadOstreamCacheInitialized = false;
+        }
+    } threadOstreamCacheFinalizer;
+} // namespace
+
 namespace logger {
 
     LogstreamBuilder::LogstreamBuilder(MessageLogDomain* domain,