Author: cwiklik
Date: Wed Jan 18 14:37:49 2017
New Revision: 1779332
URL: http://svn.apache.org/viewvc?rev=1779332&view=rev
Log:
UIMA-5255 updated after refactoring CGroupsManager
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsTest.java
Modified:
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsTest.java
URL:
http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsTest.java?rev=1779332&r1=1779331&r2=1779332&view=diff
==============================================================================
---
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsTest.java
(original)
+++
uima/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsTest.java
Wed Jan 18 14:37:49 2017
@@ -95,12 +95,7 @@ public class CGroupsTest {
if (cgroupsBaseDir == null) {
cgroupsBaseDir = "/cgroup/ducc";
}
- // get the cgroup subsystems. If not defined, default to the
- // memory and cpu subsystem
- String cgroupsSubsystems =
System.getProperty("ducc.agent.launcher.cgroups.subsystems");
- if (cgroupsSubsystems == null) {
- cgroupsSubsystems = "memory,cpu";
- }
+ String cgroupsSubsystems = "memory,cpu";
long maxTimeToWaitForProcessToStop = 60000; // default 1 minute
cgroupsManager =
