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/18 21:23:57 UTC
svn commit: r1524536 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent:
NodeAgent.java launcher/CGroupsManager.java launcher/DuccCommandExecutor.java
Author: cwiklik
Date: Wed Sep 18 19:23:56 2013
New Revision: 1524536
URL: http://svn.apache.org/r1524536
Log:
UIMA-3279 remove hardcoded path to cgroups utils and instead use the path specified in the ducc.properties
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java?rev=1524536&r1=1524535&r2=1524536&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/NodeAgent.java Wed Sep 18 19:23:56 2013
@@ -199,6 +199,7 @@ public class NodeAgent extends AbstractD
}
/* Enable CGROUPS */
String cgroups;
+ String cgUtilsPath=null;
boolean excludeNodeFromCGroups = false;
if (!virtualAgent
&& (cgroups = System.getProperty("ducc.agent.launcher.cgroups.enable")) != null) {
@@ -229,7 +230,7 @@ public class NodeAgent extends AbstractD
if (!excludeNodeFromCGroups) {
// fetch a list of paths the agent will search to find cgroups utils
// like cgexec. The default location is /usr/bin
- String cgUtilsPath=null;
+
String cgroupsUtilsDirs = System.getProperty("ducc.agent.launcher.cgroups.utils.dir");
if (cgroupsUtilsDirs == null) {
cgUtilsPath = "/usr/bin"; // default
@@ -285,7 +286,7 @@ public class NodeAgent extends AbstractD
logger.info("nodeAgent", null, "------- CGroups Not Enabled on this Machine");
}
logger.info("nodeAgent", null, "CGroup Support=" + useCgroups + " excludeNodeFromCGroups="
- + excludeNodeFromCGroups + " excludeAPs=" + excludeAPs);
+ + excludeNodeFromCGroups + " excludeAPs=" + excludeAPs+" CGroups utils Dir:"+cgUtilsPath);
String useSpawn = System.getProperty("ducc.agent.launcher.use.ducc_spawn");
if (useSpawn != null && useSpawn.toLowerCase().equals("true")) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java?rev=1524536&r1=1524535&r2=1524536&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java Wed Sep 18 19:23:56 2013
@@ -62,7 +62,9 @@ public class CGroupsManager {
e.printStackTrace();
}
}
-
+ public String getCGroupsUtilsDir( ){
+ return cgroupUtilsDir;
+ }
public CGroupsManager(String cgroupUtilsDir, String cgroupBaseDir, String cgroupSubsystems,
DuccLogger agentLogger) {
this.cgroupUtilsDir = cgroupUtilsDir;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java?rev=1524536&r1=1524535&r2=1524536&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java Wed Sep 18 19:23:56 2013
@@ -171,7 +171,7 @@ public class DuccCommandExecutor extends
}
String[] cgroupCmd = new String[cmd.length+3];
- cgroupCmd[0] = "/usr/bin/cgexec";
+ cgroupCmd[0] = agent.cgroupsManager.getCGroupsUtilsDir()+"/cgexec";
cgroupCmd[1] = "-g";
cgroupCmd[2] = agent.cgroupsManager.getSubsystems()+":ducc/"+containerId;
int inx = 3;