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 2014/04/24 18:39:47 UTC
svn commit: r1589792 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-agent/src/main/java/org/apache/uima/ducc/agent/launcher/DuccCommandExecutor.java
Author: cwiklik
Date: Thu Apr 24 16:39:46 2014
New Revision: 1589792
URL: http://svn.apache.org/r1589792
Log:
UIMA-3777 prevent exit code from being reset to 0 if a process is killed via SIGTERM
Modified:
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/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=1589792&r1=1589791&r2=1589792&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 Thu Apr 24 16:39:46 2014
@@ -53,6 +53,7 @@ public class DuccCommandExecutor extends
NodeAgent.COMPONENT_NAME);
@SuppressWarnings("unused")
private static AtomicInteger nextPort = new AtomicInteger(30000);
+ private static int SIGTERM_KILL_EXITCODE = 143;
public DuccCommandExecutor(NodeAgent agent, ICommandLine cmdLine,String host, String ip, Process managedProcess)
throws Exception {
@@ -395,8 +396,9 @@ public class DuccCommandExecutor extends
}
}
// if DUCC kills a process, its exitCode should be reset to 0
- if ( ((ManagedProcess)super.managedProcess).doKill() || isKillCmd ||
- ((ManagedProcess)super.managedProcess).isStopping()) { // always true when undeploying process
+ if ( exitCode != SIGTERM_KILL_EXITCODE &&
+ ( ((ManagedProcess)super.managedProcess).doKill() || isKillCmd ||
+ ((ManagedProcess)super.managedProcess).isStopping()) ) { // always true when undeploying process
exitCode = 0;
}