svn commit: r1517842 - /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java

[degenaro]

Author: degenaro
Date: Tue Aug 27 15:04:01 2013
New Revision: 1517842

URL: http://svn.apache.org/r1517842
Log:
UIMA-3163 Only count JP failures toward limit of excessive run fails when Agent 
Reason is one of: Croaked, ExceededShareSize, ExceededSwapThreshold

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java?rev=1517842&r1=1517841&r2=1517842&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
 Tue Aug 27 15:04:01 2013
@@ -28,6 +28,7 @@ import org.apache.uima.ducc.common.NodeI
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.transport.Constants;
+import 
org.apache.uima.ducc.transport.event.common.IDuccProcess.ReasonForStoppingProcess;
 import org.apache.uima.ducc.transport.event.common.IProcessState.ProcessState;
 
 public class DuccProcessMap extends TreeMap<DuccId,IDuccProcess> implements 
IDuccProcessMap {
@@ -222,6 +223,22 @@ public class DuccProcessMap extends Tree
                }
        }
 
+       public static boolean isUserFailureReasonForStoppingProcess(String 
reason) {
+               boolean retVal = false;
+               if(reason != null) {
+                       
if(reason.equals(ReasonForStoppingProcess.Croaked.name())) {
+                               retVal = true;
+                       }
+                       else 
if(reason.equals(ReasonForStoppingProcess.ExceededShareSize.name())) {
+                               retVal = true;
+                       }
+                       else 
if(reason.equals(ReasonForStoppingProcess.ExceededSwapThreshold.name())) {
+                               retVal = true;
+                       }
+               }
+               return retVal;
+       }
+       
        private boolean isFailedProcess(IDuccProcess process) {
                boolean retVal = false;
                ProcessState processState = process.getProcessState();
@@ -230,14 +247,7 @@ public class DuccProcessMap extends Tree
                case Failed:
                case Stopped:
                case Killed:
-                       if(reason != null) {
-                               if(reason.equals("")) {
-                                       // Nevermind
-                               }
-                               else {
-                                       retVal = true;
-                               }
-                       }
+                       retVal = isUserFailureReasonForStoppingProcess(reason);
                }
                return retVal;
        }