summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2020-01-31 13:41:08 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-05 19:09:37 +0000
commit746549116acd3139e64520159e8542387edce0b1 (patch)
tree8edadb2cc3ee6e07dfd83aec55ecdcb994b02ad8
parentb57cfb409cf083d0192d6600e296c26ee030d6d4 (diff)
downloadmongo-746549116acd3139e64520159e8542387edce0b1.tar.gz
SERVER-40506 hostInfo & FTDC to report container vCPU
-rw-r--r--src/mongo/db/commands/generic_servers.cpp2
-rw-r--r--src/mongo/db/ftdc/ftdc_system_stats_linux.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/commands/generic_servers.cpp b/src/mongo/db/commands/generic_servers.cpp
index 88c137982a9..5ddd102c366 100644
--- a/src/mongo/db/commands/generic_servers.cpp
+++ b/src/mongo/db/commands/generic_servers.cpp
@@ -121,7 +121,7 @@ public:
bSys.append("cpuAddrSize", static_cast<int>(p.getAddrSize()));
bSys.append("memSizeMB", static_cast<long long>(p.getSystemMemSizeMB()));
bSys.append("memLimitMB", static_cast<long long>(p.getMemSizeMB()));
- bSys.append("numCores", static_cast<int>(p.getNumCores()));
+ bSys.append("numCores", static_cast<int>(p.getNumAvailableCores()));
bSys.append("cpuArch", p.getArch());
bSys.append("numaEnabled", p.hasNumaEnabled());
bOs.append("type", p.getOsType());
diff --git a/src/mongo/db/ftdc/ftdc_system_stats_linux.cpp b/src/mongo/db/ftdc/ftdc_system_stats_linux.cpp
index 08fedbb8e6b..35537d34360 100644
--- a/src/mongo/db/ftdc/ftdc_system_stats_linux.cpp
+++ b/src/mongo/db/ftdc/ftdc_system_stats_linux.cpp
@@ -91,7 +91,7 @@ public:
// Include the number of cpus to simplify client calculations
ProcessInfo p;
- subObjBuilder.append("num_cpus", static_cast<int>(p.getNumCores()));
+ subObjBuilder.append("num_cpus", static_cast<int>(p.getNumAvailableCores()));
processStatusErrors(
procparser::parseProcStatFile("/proc/stat"_sd, kCpuKeys, &subObjBuilder),