You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by cw...@apache.org on 2013/09/24 21:26:06 UTC
svn commit: r1525978 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Author: cwiklik
Date: Tue Sep 24 19:26:05 2013
New Revision: 1525978
URL: http://svn.apache.org/r1525978
Log:
UIMA-3298 Dont use Memory Guard if cgroups are enabled
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java?rev=1525978&r1=1525977&r2=1525978&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/processors/LinuxProcessMetricsProcessor.java Tue Sep 24 19:26:05 2013
@@ -304,10 +304,9 @@ public class LinuxProcessMetricsProcesso
}
return;
} else {
- // if the fudgeFactor is negative, don't check if the process exceeded its
- // memory assignment.
+ // Use Memory Guard only if cgroups are disabled and fudge factor > -1
- if (fudgeFactor > -1
+ if ( !agent.useCgroups && fudgeFactor > -1
&& managedProcess.getProcessMemoryAssignment().getMaxMemoryWithFudge() > 0) {
// RSS is in terms of pages(blocks) which size is system dependent. Default 4096 bytes
long rss = (totalRss * (blockSize / 1024)) / 1024; // normalize RSS into MB