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 2015/09/02 15:09:34 UTC
svn commit: r1700804 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
Author: cwiklik
Date: Wed Sep 2 13:09:33 2015
New Revision: 1700804
URL: http://svn.apache.org/r1700804
Log:
UIMA-4578 when killing process wait until process exits. Added more logging
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/CGroupsManager.java
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=1700804&r1=1700803&r2=1700804&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 2 13:09:33 2015
@@ -296,6 +296,7 @@ public class CGroupsManager {
// dont care about the output, just drain the buffers
}
is.close();
+ killedProcess.waitFor();
StringBuffer sb = new StringBuffer();
for (String part : duccling_nolog) {
sb.append(part).append(" ");
@@ -505,6 +506,8 @@ public class CGroupsManager {
try {
if (cgroupExists(cgroupBaseDir + "/" + containerId)) {
if ( signal == NodeAgent.SIGTERM ) {
+ agentLogger.info("destroyContainer", null, "Destroying Container "+containerId+" Using signal:"+signal +" to kill child processes if any still exist in cgroups container");
+
// before removing cgroup container, make sure to kill
// all processes that still may be there. User process
// may have created child processes that may still be running.
@@ -513,6 +516,7 @@ public class CGroupsManager {
int childProcessCount =
killChildProcesses(containerId, userId, NodeAgent.SIGTERM);
if ( childProcessCount > 0 ) {
+ agentLogger.info("destroyContainer", null, "Killed "+childProcessCount+"Child Processes with kill -15");
try {
this.wait(maxTimeToWaitForProcessToStop);
} catch( InterruptedException ie) {