You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by id...@apache.org on 2014/05/05 22:25:16 UTC
git commit: Move OOM log message to appear only on actual OOM
Repository: mesos
Updated Branches:
refs/heads/master 106a63017 -> 652537d9c
Move OOM log message to appear only on actual OOM
Review: https://reviews.apache.org/r/20139
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/652537d9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/652537d9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/652537d9
Branch: refs/heads/master
Commit: 652537d9c1432ffd221e806696fe187dd17258dc
Parents: 106a630
Author: Ian Downes <id...@twitter.com>
Authored: Tue Apr 8 15:12:01 2014 -0700
Committer: Ian Downes <id...@twitter.com>
Committed: Mon May 5 13:24:00 2014 -0700
----------------------------------------------------------------------
src/slave/containerizer/isolators/cgroups/mem.cpp | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/652537d9/src/slave/containerizer/isolators/cgroups/mem.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/isolators/cgroups/mem.cpp b/src/slave/containerizer/isolators/cgroups/mem.cpp
index 18d9c78..6324dcd 100644
--- a/src/slave/containerizer/isolators/cgroups/mem.cpp
+++ b/src/slave/containerizer/isolators/cgroups/mem.cpp
@@ -425,9 +425,6 @@ void CgroupsMemIsolatorProcess::oomWaited(
const ContainerID& containerId,
const Future<uint64_t>& future)
{
- LOG(INFO) << "OOM notifier is triggered for container "
- << containerId;
-
if (future.isDiscarded()) {
LOG(INFO) << "Discarded OOM notifier for container "
<< containerId;
@@ -436,6 +433,7 @@ void CgroupsMemIsolatorProcess::oomWaited(
<< containerId << ": " << future.failure();
} else {
// Out-of-memory event happened, call the handler.
+ LOG(INFO) << "OOM notifier is triggered for container " << containerId;
oom(containerId);
}
}