Skip to content

SERVER-119885 Fix handling of the "max" value in cgroup v2 "memory.max" #1632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
igorsol wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −1
Open

SERVER-119885 Fix handling of the "max" value in cgroup v2 "memory.max" #1632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/mongo/util/processinfo_linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@ class LinuxSysHelper {
if (f != nullptr) {
if (fgets(fstr, 1023, f) != nullptr)
fstr[strlen(fstr) < 1 ? 0 : strlen(fstr) - 1] = '\0';
else
fstr[0] = '\0';
fclose(f);
}
return fstr;
Expand Down
5 changes: 4 additions & 1 deletion src/third_party/tcmalloc/dist/tcmalloc/cpu_cache.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ std::string parseLineFromFile(const char* fname) {
if (f != nullptr) {
if (fgets(fstr, 1023, f) != nullptr)
fstr[strlen(fstr) < 1 ? 0 : strlen(fstr) - 1] = '\0';
else
fstr[0] = '\0';
fclose(f);
}

Expand All @@ -69,7 +71,8 @@ unsigned long long getMemorySizeLimitInBytes() {
unsigned long long groupMemBytes = 0;
std::string groupLimit = parseLineFromFile(file);

if (!groupLimit.empty() ) {
// The "max" value in cgroups v2 means no limit.
if (!groupLimit.empty() && groupLimit != "max") {
return std::min(systemMemBytes, (unsigned long long)atoll(groupLimit.c_str()));
}
}
Expand Down