summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Cooper <adam.cooper@mongodb.com>2020-07-13 16:23:24 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-07-14 21:45:01 +0000
commit12a8c37e8ff987be7c263727257f67e51f6563f2 (patch)
tree3ac63ed6a2b9c3cd05934157ee33bd2352bf0066
parentc02d19aebdba13451d576f56885e3358dad90e48 (diff)
downloadmongo-12a8c37e8ff987be7c263727257f67e51f6563f2.tar.gz
SERVER-49216 rlimit warning does not say which setting it refers to
-rw-r--r--src/mongo/db/startup_warnings_mongod.cpp32
1 files changed, 17 insertions, 15 deletions
diff --git a/src/mongo/db/startup_warnings_mongod.cpp b/src/mongo/db/startup_warnings_mongod.cpp
index 79e2588f6c5..bcbdd49355a 100644
--- a/src/mongo/db/startup_warnings_mongod.cpp
+++ b/src/mongo/db/startup_warnings_mongod.cpp
@@ -290,13 +290,14 @@ void logMongodStartupWarnings(const StorageGlobalParams& storageParams,
if (!getrlimit(RLIMIT_NOFILE, &rlnofile)) {
if (rlnofile.rlim_cur < minNumFiles) {
- LOGV2_WARNING_OPTIONS(
- 22184,
- {logv2::LogTag::kStartupWarnings},
- "Soft rlimits is {currentValue}, recommended minimum is {recommendedMinimum}",
- "Soft rlimits too low",
- "currentValue"_attr = rlnofile.rlim_cur,
- "recommendedMinimum"_attr = minNumFiles);
+ LOGV2_WARNING_OPTIONS(22184,
+ {logv2::LogTag::kStartupWarnings},
+ "** WARNING: Soft rlimits too low. The limit for open file "
+ "descriptors is {currentValue}, recommended "
+ "minimum is {recommendedMinimum}",
+ "Soft rlimits for open file descriptors too low",
+ "currentValue"_attr = rlnofile.rlim_cur,
+ "recommendedMinimum"_attr = minNumFiles);
}
} else {
const auto errmsg = errnoWithDescription();
@@ -316,14 +317,15 @@ void logMongodStartupWarnings(const StorageGlobalParams& storageParams,
if (!getrlimit(RLIMIT_MEMLOCK, &rlmemlock)) {
if ((rlmemlock.rlim_cur / ProcessInfo::getPageSize()) < minLockedPages) {
- LOGV2_WARNING_OPTIONS(
- 22188,
- {logv2::LogTag::kStartupWarnings},
- "** WARNING: Soft rlimits too low. The locked memory size is {lockedMemoryBytes} "
- "bytes, it should be at least {minLockedMemoryBytes} bytes",
- "Soft rlimits too low",
- "lockedMemoryBytes"_attr = rlmemlock.rlim_cur,
- "minLockedMemoryBytes"_attr = minLockedPages * ProcessInfo::getPageSize());
+ LOGV2_WARNING_OPTIONS(22188,
+ {logv2::LogTag::kStartupWarnings},
+ "** WARNING: Soft rlimits too low. The limit for locked memory "
+ "size is {lockedMemoryBytes} "
+ "bytes, it should be at least {minLockedMemoryBytes} bytes",
+ "Soft rlimit for locked memory too low",
+ "lockedMemoryBytes"_attr = rlmemlock.rlim_cur,
+ "minLockedMemoryBytes"_attr =
+ minLockedPages * ProcessInfo::getPageSize());
}
} else {
const auto errmsg = errnoWithDescription();