SERVER-24395 Do not display startup warnings when querying for version

2 files changed, 7 insertions, 4 deletions

diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
index 30c8b261fdc..abfc763739f 100644
--- a/src/mongo/db/startup_warnings_mongod.cpp
+++ b/src/mongo/db/startup_warnings_mongod.cpp
@@ -360,6 +360,13 @@ void logMongodStartupWarnings(const StorageGlobalParams& storageParams,
               << startupWarningsLog;
         warned = true;
     }
+
+    if (p.isDataFileZeroingNeeded()) {
+        log() << "Hotfix KB2731284 or later update is not installed, will zero-out data files."
+              << startupWarningsLog;
+        warned = true;
+    }
+
 #endif  // #ifdef _WIN32
 
     if (storageParams.engine == "ephemeralForTest") {
diff --git a/src/mongo/util/processinfo_windows.cpp b/src/mongo/util/processinfo_windows.cpp
index 0e9cb8cc578..a4346cf7c74 100644
--- a/src/mongo/util/processinfo_windows.cpp
+++ b/src/mongo/util/processinfo_windows.cpp
@@ -326,12 +326,8 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
                         //
                         if ((osvi.wServicePackMajor >= 0) && (osvi.wServicePackMajor < 2)) {
                             if (isKB2731284OrLaterUpdateInstalled()) {
-                                log() << "Hotfix KB2731284 or later update is installed, no need "
-                                         "to zero-out data files";
                                 fileZeroNeeded = false;
                             } else {
-                                log() << "Hotfix KB2731284 or later update is not installed, will "
-                                         "zero-out data files";
                                 fileZeroNeeded = true;
                             }
                         }