Update upstream source from tag 'upstream/6.0.0'master

Update to upstream version '6.0.0'
with Debian dir 5604a80ec1c96ca76f25f40d78e6ef855abec322

1 files changed, 38 insertions, 75 deletions

diff --git a/src/mongo/util/processinfo_linux.cpp b/src/mongo/util/processinfo_linux.cpp
index 7793011e901..37e3d2ea3fc 100644
--- a/src/mongo/util/processinfo_linux.cpp
+++ b/src/mongo/util/processinfo_linux.cpp
@@ -407,30 +407,9 @@ public:
     }
 
     /**
-     * count the number of processor packages
-     */
-    static int getNumCpuSockets() {
-        std::set<std::string> socketIds;
-
-        CpuInfoParser cpuInfoParser{
-            {
-                {"physical id", [&](const std::string& value) { socketIds.insert(value); }},
-            },
-            []() {}};
-        cpuInfoParser.run();
-
-        // On ARM64, the "physical id" field is unpopulated, causing there to be 0 sockets found. In
-        // this case, we default to 1.
-        return std::max(socketIds.size(), 1ul);
-    }
-
-    /**
      * Get some details about the CPU
      */
-    static void getCpuInfo(int& procCount,
-                           std::string& modelString,
-                           std::string& freq,
-                           std::string& features) {
+    static void getCpuInfo(int& procCount, std::string& freq, std::string& features) {
 
         procCount = 0;
 
@@ -442,7 +421,6 @@ public:
                 {"features", [&](const std::string& value) { features = value; }},
 #else
                 {"processor", [&](const std::string& value) { procCount++; }},
-                {"model name", [&](const std::string& value) { modelString = value; }},
                 {"cpu MHz", [&](const std::string& value) { freq = value; }},
                 {"flags", [&](const std::string& value) { features = value; }},
 #endif
@@ -668,49 +646,6 @@ void ProcessInfo::getExtraInfo(BSONObjBuilder& info) {
 
     appendNumber("voluntary_context_switches", ru.ru_nvcsw);
     appendNumber("involuntary_context_switches", ru.ru_nivcsw);
-
-    LinuxProc p(_pid);
-
-    // Append the number of thread in use
-    appendNumber("threads", p._nlwp);
-}
-
-/**
- * If the process is running with (cc)NUMA enabled, return the number of NUMA nodes. Else, return 0.
- */
-unsigned long countNumaNodes() {
-    bool hasMultipleNodes = false;
-    bool hasNumaMaps = false;
-
-    try {
-        hasMultipleNodes = boost::filesystem::exists("/sys/devices/system/node/node1");
-        hasNumaMaps = boost::filesystem::exists("/proc/self/numa_maps");
-
-        if (hasMultipleNodes && hasNumaMaps) {
-            // proc is populated with numa entries
-
-            // read the second column of first line to determine numa state
-            // ('default' = enabled, 'interleave' = disabled).  Logic from version.cpp's warnings.
-            std::string line =
-                LinuxSysHelper::readLineFromFile("/proc/self/numa_maps").append(" \0");
-            size_t pos = line.find(' ');
-            if (pos != std::string::npos &&
-                line.substr(pos + 1, 10).find("interleave") == std::string::npos) {
-                // interleave not found, count NUMA nodes by finding the highest numbered node file
-                unsigned long i = 2;
-                while (boost::filesystem::exists(
-                    std::string(str::stream() << "/sys/devices/system/node/node" << i++)))
-                    ;
-                return i - 1;
-            }
-        }
-    } catch (boost::filesystem::filesystem_error& e) {
-        LOGV2(23340,
-              "WARNING: Cannot detect if NUMA interleaving is enabled. Failed to probe",
-              "path"_attr = e.path1().string(),
-              "reason"_attr = e.code().message());
-    }
-    return 0;
 }
 
 /**
@@ -719,15 +654,13 @@ unsigned long countNumaNodes() {
 void ProcessInfo::SystemInfo::collectSystemInfo() {
     utsname unameData;
     std::string distroName, distroVersion;
-    std::string cpuString, cpuFreq, cpuFeatures;
+    std::string cpuFreq, cpuFeatures;
     int cpuCount;
     int physicalCores;
-    int cpuSockets;
 
     std::string verSig = LinuxSysHelper::readLineFromFile("/proc/version_signature");
-    LinuxSysHelper::getCpuInfo(cpuCount, cpuString, cpuFreq, cpuFeatures);
+    LinuxSysHelper::getCpuInfo(cpuCount, cpuFreq, cpuFeatures);
     LinuxSysHelper::getNumPhysicalCores(physicalCores);
-    cpuSockets = LinuxSysHelper::getNumCpuSockets();
     LinuxSysHelper::getLinuxDistro(distroName, distroVersion);
 
     if (uname(&unameData) == -1) {
@@ -744,12 +677,9 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
     memLimit = LinuxSysHelper::getMemorySizeLimit();
     addrSize = sizeof(void*) * CHAR_BIT;
     numCores = cpuCount;
-    numPhysicalCores = physicalCores;
-    numCpuSockets = cpuSockets;
     pageSize = static_cast<unsigned long long>(sysconf(_SC_PAGESIZE));
     cpuArch = unameData.machine;
-    numNumaNodes = countNumaNodes();
-    hasNuma = numNumaNodes;
+    hasNuma = checkNumaEnabled();
 
     BSONObjBuilder bExtra;
     bExtra.append("versionString", LinuxSysHelper::readLineFromFile("/proc/version"));
@@ -769,16 +699,49 @@ void ProcessInfo::SystemInfo::collectSystemInfo() {
         bExtra.append("versionSignature", verSig);
 
     bExtra.append("kernelVersion", unameData.release);
-    bExtra.append("cpuString", cpuString);
     bExtra.append("cpuFrequencyMHz", cpuFreq);
     bExtra.append("cpuFeatures", cpuFeatures);
     bExtra.append("pageSize", static_cast<long long>(pageSize));
     bExtra.append("numPages", static_cast<int>(sysconf(_SC_PHYS_PAGES)));
     bExtra.append("maxOpenFiles", static_cast<int>(sysconf(_SC_OPEN_MAX)));
+    bExtra.append("physicalCores", physicalCores);
 
     appendMountInfo(bExtra);
 
     _extraStats = bExtra.obj();
 }
 
+/**
+ * Determine if the process is running with (cc)NUMA
+ */
+bool ProcessInfo::checkNumaEnabled() {
+    bool hasMultipleNodes = false;
+    bool hasNumaMaps = false;
+
+    try {
+        hasMultipleNodes = boost::filesystem::exists("/sys/devices/system/node/node1");
+        hasNumaMaps = boost::filesystem::exists("/proc/self/numa_maps");
+    } catch (boost::filesystem::filesystem_error& e) {
+        LOGV2(23340,
+              "WARNING: Cannot detect if NUMA interleaving is enabled. Failed to probe",
+              "path"_attr = e.path1().string(),
+              "reason"_attr = e.code().message());
+        return false;
+    }
+
+    if (hasMultipleNodes && hasNumaMaps) {
+        // proc is populated with numa entries
+
+        // read the second column of first line to determine numa state
+        // ('default' = enabled, 'interleave' = disabled).  Logic from version.cpp's warnings.
+        std::string line = LinuxSysHelper::readLineFromFile("/proc/self/numa_maps").append(" \0");
+        size_t pos = line.find(' ');
+        if (pos != std::string::npos &&
+            line.substr(pos + 1, 10).find("interleave") == std::string::npos)
+            // interleave not found;
+            return true;
+    }
+    return false;
+}
+
 }  // namespace mongo