You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2014/08/13 16:01:47 UTC
svn commit: r1617730 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common:
DuccProcess.java DuccProcessMap.java IDuccProcess.java IDuccProcessMap.java
Author: degenaro
Date: Wed Aug 13 14:01:47 2014
New Revision: 1617730
URL: http://svn.apache.org/r1617730
Log:
UIMA-3921 DUCC Web Server (WS) When a JD fails to start it marks the job as complete
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcessMap.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.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/DuccProcess.java?rev=1617730&r1=1617729&r2=1617730&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccProcess.java Wed Aug 13 14:01:47 2014
@@ -388,6 +388,32 @@ public class DuccProcess implements IDuc
return retVal;
}
+ public boolean isDeallocationNormal() {
+ boolean retVal = true;
+ switch(deallocationType) {
+ case Voluntary:
+ case Forced:
+ case JobCanceled:
+ case JobFailure:
+ case JobCompleted:
+ case Stopped:
+ case Canceled:
+ retVal = true;
+ break;
+ case Exception:
+ case AutonomousStop:
+ case Failed:
+ case FailedInitialization:
+ case InitializationTimeout:
+ case Killed:
+ case Purged:
+ case Undefined:
+ retVal = false;
+ break;
+ }
+ return retVal;
+ }
+
// **********
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=1617730&r1=1617729&r2=1617730&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 Wed Aug 13 14:01:47 2014
@@ -319,6 +319,28 @@ public class DuccProcessMap extends Tree
return list.size();
}
+ public ArrayList<DuccId> getAbnormalDeallocations() {
+ ArrayList<DuccId> list = new ArrayList<DuccId>();
+ synchronized(this) {
+ Iterator<IDuccProcess> iterator = this.values().iterator();
+ while(iterator.hasNext()) {
+ IDuccProcess process = iterator.next();
+ if(!process.isDeallocationNormal()) {
+ list.add(process.getDuccId());
+ }
+ else {
+ // Nevermind
+ }
+ }
+ }
+ return list;
+ }
+
+ public int getAbnormalDeallocationCount() {
+ ArrayList<DuccId> list = getAbnormalDeallocations();
+ return list.size();
+ }
+
public long getPgInCount() {
long retVal = 0;
synchronized(this) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.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/IDuccProcess.java?rev=1617730&r1=1617729&r2=1617730&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcess.java Wed Aug 13 14:01:47 2014
@@ -80,6 +80,8 @@ public interface IDuccProcess extends Se
public boolean isDeallocated();
public boolean isDefunct();
+ public boolean isDeallocationNormal();
+
public void setResidentMemory(long residentMemory);
public long getResidentMemory();
public long getResidentMemoryMax();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.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/IDuccProcessMap.java?rev=1617730&r1=1617729&r2=1617730&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccProcessMap.java Wed Aug 13 14:01:47 2014
@@ -44,6 +44,8 @@ public interface IDuccProcessMap extends
public int getFailedInitializationCount();
public int getFailedNotInitializationCount();
+ public int getAbnormalDeallocationCount();
+
public Map<DuccId,IDuccProcess> getMap();
public IDuccProcessMap deepCopy();