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/01/15 18:11:11 UTC
svn commit: r1433529 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event:
cli/ common/ jd/ sm/
Author: cwiklik
Date: Tue Jan 15 17:11:11 2013
New Revision: 1433529
URL: http://svn.apache.org/viewvc?rev=1433529&view=rev
Log:
UIMA-2571 Committing for jim
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ServiceRequestProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccJobDeployment.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccStandardInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccStandardInfo.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IProcessState.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryItem.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryBase.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryReader.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryWriter.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDependency.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java Tue Jan 15 17:11:11 2013
@@ -37,6 +37,11 @@ public class JobSpecificationProperties
public static String key_jvm = "jvm";
+ public static String key_process_debug = "process_debug";
+ public static String key_driver_debug = "driver_debug";
+ public static String key_process_attach_console = "process_attach_console";
+ public static String key_driver_attach_console = "driver_attach_console";
+
public static String key_driver_jvm_args = "driver_jvm_args";
public static String key_driver_classpath = "driver_classpath";
public static String key_driver_environment = "driver_environment";
@@ -65,7 +70,10 @@ public class JobSpecificationProperties
public static String key_process_get_meta_time_max = "process_get_meta_time_max";
public static String key_process_per_item_time_max = "process_per_item_time_max";
-
+
+ public static String key_process_executable = "process_executable";
+ public static String key_process_executable_args = "process_executable_args";
+
public static String key_service_dependency = "service_dependency";
public static String key_wait_for_completion = "wait_for_completion";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ServiceRequestProperties.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ServiceRequestProperties.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ServiceRequestProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ServiceRequestProperties.java Tue Jan 15 17:11:11 2013
@@ -24,4 +24,8 @@ public class ServiceRequestProperties ex
* The service endpoint, extracted from the DD by service submit.
*/
public static String key_service_request_endpoint = "service_request_endpoint";
+
+ public static String key_service_type_uima = "service_type_uima";
+ public static String key_service_type_custom = "service_type_custom";
+ public static String key_service_type_other = "service_type_other";
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.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/ADuccWork.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/ADuccWork.java Tue Jan 15 17:11:11 2013
@@ -20,6 +20,7 @@ package org.apache.uima.ducc.transport.e
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
+import org.apache.uima.ducc.transport.event.common.IDuccWorkService.ServiceDeploymentType;
/*
* Work data
@@ -37,6 +38,7 @@ public abstract class ADuccWork implemen
private Object stateObject = null;
private Object completionTypeObject = null;
private String[] serviceDependencies = null;
+ private ServiceDeploymentType serviceDeploymentType = null;
private String serviceEndpoint = null; // generated in submit
@Override
@@ -117,6 +119,16 @@ public abstract class ADuccWork implemen
return this.serviceDependencies;
}
+ public void setServiceDeploymentType(ServiceDeploymentType serviceDeploymentType)
+ {
+ this.serviceDeploymentType = serviceDeploymentType;
+ }
+
+ public ServiceDeploymentType getServiceDeploymentType()
+ {
+ return serviceDeploymentType;
+ }
+
public void setServiceEndpoint(String ep)
{
this.serviceEndpoint = ep;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccJobDeployment.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/DuccJobDeployment.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccJobDeployment.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccJobDeployment.java Tue Jan 15 17:11:11 2013
@@ -24,33 +24,43 @@ import java.util.List;
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.transport.cmdline.ICommandLine;
import org.apache.uima.ducc.transport.cmdline.JavaCommandLine;
+import org.apache.uima.ducc.transport.cmdline.NonJavaCommandLine;
public class DuccJobDeployment implements IDuccJobDeployment {
private static final long serialVersionUID = 1L;
private DuccId jobId;
// at most two command lines can be accommodated
- private ICommandLine[] jclArray = new JavaCommandLine[2];
- private IDuccStandardInfo stdInfo;
+ private ICommandLine[] jdclArray = new JavaCommandLine[1];
+ private ICommandLine[] pclArray;// = new JavaCommandLine[2];
+
+ private IDuccStandardInfo stdInfo;
private List<IDuccProcess> jobProcesses = new ArrayList<IDuccProcess>();
private long processMemoryAssignment;
public DuccJobDeployment( DuccId jobId, ICommandLine jdCmdLine, ICommandLine jpCmdLine,
IDuccStandardInfo stdInfo, IDuccProcess jdProcess, long processMemoryAssignment, List<IDuccProcess> jps ) {
this.jobId = jobId;
- this.jclArray[0] = jdCmdLine;
- this.jclArray[1] = jpCmdLine;
+// this.jdclArray = new JavaCommandLine[2];
+
+ if ( jpCmdLine instanceof JavaCommandLine ) {
+ this.pclArray = new JavaCommandLine[1];
+ } else {
+ this.pclArray = new NonJavaCommandLine[1];
+ }
+ this.jdclArray[0] = jdCmdLine;
+ this.pclArray[0] = jpCmdLine;
this.stdInfo = stdInfo;
this.jobProcesses.add(jdProcess);
this.jobProcesses.addAll(jps);
this.processMemoryAssignment = processMemoryAssignment;
}
public ICommandLine getJdCmdLine() {
- return this.jclArray[0];
+ return this.jdclArray[0];
}
public ICommandLine getJpCmdLine() {
- return this.jclArray[1];
+ return this.pclArray[0];
}
public IDuccStandardInfo getStandardInfo() {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccStandardInfo.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/DuccStandardInfo.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccStandardInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccStandardInfo.java Tue Jan 15 17:11:11 2013
@@ -30,6 +30,7 @@ public class DuccStandardInfo implements
*/
private static final long serialVersionUID = 1L;
private String user = null;
+ private String submitter = null;
private String dateOfSubmission = null;
private String cancelUser = null;
private String dateOfCompletion = null;
@@ -50,13 +51,13 @@ public class DuccStandardInfo implements
}
@Override
- public String getSubmitUser() {
- return getUser();
+ public String getSubmitter() {
+ return submitter;
}
@Override
- public void setSubmitUser(String user) {
- setUser(user);
+ public void setSubmitter(String submitter) {
+ this.submitter = submitter;
}
@Override
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.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/DuccWorkJob.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java Tue Jan 15 17:11:11 2013
@@ -26,7 +26,6 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccState.JobState;
import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
-
public class DuccWorkJob extends ADuccWorkExecutable implements IDuccWorkJob {
/**
* please increment this sUID when removing or modifying a field
@@ -325,6 +324,22 @@ public class DuccWorkJob extends ADuccWo
processFailureLimit.set(limit);
return;
}
+
+ @Override
+ public long getAliveProcessCount() {
+ long retVal = 0;
+ IDuccProcessMap processMap = this.getProcessMap();
+ if(processMap != null) {
+ int count = processMap.getAliveProcessCount();
+ retVal = count;
+ }
+ return retVal;
+ }
+
+ @Override
+ public boolean hasAliveProcess() {
+ return (getAliveProcessCount() > 0);
+ }
// **********
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.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/DuccWorkReservation.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java Tue Jan 15 17:11:11 2013
@@ -18,6 +18,9 @@
*/
package org.apache.uima.ducc.transport.event.common;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
@@ -164,6 +167,10 @@ public class DuccWorkReservation extends
return retVal;
}
+ public boolean isFinished() {
+ return isCompleted();
+ }
+
@Override
public boolean isOperational() {
boolean retVal = true;
@@ -290,6 +297,34 @@ public class DuccWorkReservation extends
logger.info(methodName, getDuccId(), getReservationState());
}
+ public List<String> getNodes(boolean unique) {
+ ArrayList<String> list = new ArrayList<String>();
+ if(!getReservationMap().isEmpty()) {
+ IDuccReservationMap map = getReservationMap();
+ for (DuccId key : map.keySet()) {
+ IDuccReservation value = getReservationMap().get(key);
+ String node = value.getNodeIdentity().getName();
+ if(unique) {
+ if(!list.contains(node)) {
+ list.add(node);
+ }
+ }
+ else {
+ list.add(node);
+ }
+ }
+ }
+ return list;
+ }
+
+ public List<String> getNodes() {
+ return getNodes(false);
+ }
+
+ public List<String> getUniqueNodes() {
+ return getNodes(true);
+ }
+
// **********
@Override
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccStandardInfo.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/IDuccStandardInfo.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccStandardInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccStandardInfo.java Tue Jan 15 17:11:11 2013
@@ -25,8 +25,8 @@ public interface IDuccStandardInfo exten
public String getUser();
public void setUser(String user);
- public String getSubmitUser();
- public void setSubmitUser(String user);
+ public String getSubmitter();
+ public void setSubmitter(String submitter);
public String getDateOfSubmission();
public void setDateOfSubmission(String dateOfSubmission);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.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/IDuccWork.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWork.java Tue Jan 15 17:11:11 2013
@@ -50,9 +50,6 @@ public interface IDuccWork extends Seria
public String[] getServiceDependencies();
public void setServiceDependencies(String[] serviceDependencies);
- public String getServiceEndpoint();
- public void setServiceEndpoint(String ep);
-
public boolean isSchedulable();
public boolean isCompleted();
public boolean isOperational();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.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/IDuccWorkJob.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkJob.java Tue Jan 15 17:11:11 2013
@@ -69,4 +69,7 @@ public interface IDuccWorkJob extends ID
public long getProcessFailureLimit();
public void setProcessFailureLimit(long limit);
+
+ public long getAliveProcessCount();
+ public boolean hasAliveProcess();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.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/IDuccWorkReservation.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java Tue Jan 15 17:11:11 2013
@@ -19,6 +19,7 @@
package org.apache.uima.ducc.transport.event.common;
import java.io.Serializable;
+import java.util.List;
import org.apache.uima.ducc.transport.event.common.IDuccCompletionType.ReservationCompletionType;
import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
@@ -44,9 +45,12 @@ public interface IDuccWorkReservation ex
public boolean isSchedulable();
public boolean isDispatchable();
public boolean isCompleted();
+ public boolean isFinished();
public boolean stateChange(ReservationState state);
public boolean complete(ReservationCompletionType completionType);
public void logState();
+
+ public List<String> getUniqueNodes();
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkService.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/IDuccWorkService.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkService.java Tue Jan 15 17:11:11 2013
@@ -19,5 +19,12 @@
package org.apache.uima.ducc.transport.event.common;
public interface IDuccWorkService extends IDuccWork {
-
+
+ public enum ServiceDeploymentType { uima, custom, other, unspecified };
+
+ public ServiceDeploymentType getServiceDeploymentType();
+ public void setServiceDeploymentType(ServiceDeploymentType serviceDeploymentType);
+
+ public String getServiceEndpoint();
+ public void setServiceEndpoint(String ep);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IProcessState.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/IProcessState.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IProcessState.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IProcessState.java Tue Jan 15 17:11:11 2013
@@ -31,6 +31,7 @@ public interface IProcessState extends S
FailedInitialization, // Process Agent reports process failed initialization
InitializationTimeout, // Process Agent reports process initialization timeout
Killed, // Agent forcefully killed the process
+ KillProcess, // UIMA-AS Ducc Service Wrapper requesting agent to kill the process
Undefined // None of the above
};
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryItem.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryItem.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryItem.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryItem.java Tue Jan 15 17:11:11 2013
@@ -41,6 +41,22 @@ public class PerformanceMetricsSummaryIt
this.uniqueName = uniqueName;
}
+ public PerformanceMetricsSummaryItem(String name,
+ String uniqueName,
+ long analysisTime,
+ long numProcessed,
+ long analysisTimeMin,
+ long analysisTimeMax
+ )
+ {
+ this.name = name;
+ this.uniqueName = uniqueName;
+ this.analysisTime.set(analysisTime);
+ this.numProcessed.set(numProcessed);
+ this.analysisTimeMin.set(analysisTimeMin);
+ this.analysisTimeMax.set(analysisTimeMax);
+ }
+
public String getName() {
return name;
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceMetricsSummaryMap.java Tue Jan 15 17:11:11 2013
@@ -111,4 +111,12 @@ public class PerformanceMetricsSummaryMa
public int casCount() {
return casCount.get();
}
+
+ protected void putItem(String key, PerformanceMetricsSummaryItem value) {
+ map.put(key, value);
+ }
+
+ protected void putCasCount(int value) {
+ casCount.set(value);
+ }
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryBase.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryBase.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryBase.java Tue Jan 15 17:11:11 2013
@@ -18,6 +18,7 @@
*/
package org.apache.uima.ducc.transport.event.jd;
+import org.apache.uima.ducc.common.jd.files.JobPerformanceSummaryJsonGz;
import org.apache.uima.ducc.common.utils.IOHelper;
public class PerformanceSummaryBase {
@@ -26,6 +27,7 @@ public class PerformanceSummaryBase {
protected String filename = null;
protected PerformanceMetricsSummaryMap summaryMap = null;
+ protected JobPerformanceSummaryJsonGz jsonGz = null;
protected PerformanceSummaryBase(String dirname) {
init(dirname);
@@ -34,6 +36,7 @@ public class PerformanceSummaryBase {
protected void init(String dirname) {
this.filename = IOHelper.marryDir2File(dirname,job_performance_summary_ser);
this.summaryMap = new PerformanceMetricsSummaryMap();
+ this.jsonGz = new JobPerformanceSummaryJsonGz(dirname);
}
public PerformanceMetricsSummaryMap getSummaryMap() {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryReader.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryReader.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryReader.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryReader.java Tue Jan 15 17:11:11 2013
@@ -19,7 +19,15 @@
package org.apache.uima.ducc.transport.event.jd;
import java.io.FileInputStream;
+import java.io.IOException;
import java.io.ObjectInputStream;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import org.apache.uima.ducc.common.jd.files.IJobPerformanceSummary;
+import org.apache.uima.ducc.common.jd.files.JobPerformanceSummary;
+import org.apache.uima.ducc.common.jd.files.JobPerformanceSummaryData;
public class PerformanceSummaryReader extends PerformanceSummaryBase {
@@ -27,18 +35,55 @@ public class PerformanceSummaryReader ex
super(dirname);
}
+ public PerformanceMetricsSummaryMap readJsonGz() throws IOException, ClassNotFoundException {
+ PerformanceMetricsSummaryMap map = new PerformanceMetricsSummaryMap();
+ JobPerformanceSummaryData data = jsonGz.importData();
+ Integer casCount = data.getCasCount();
+ map.putCasCount(casCount);
+ ConcurrentSkipListMap<String, JobPerformanceSummary> gzMap = data.getMap();
+ Set<Entry<String, JobPerformanceSummary>> entries = gzMap.entrySet();
+ for(Entry<String, JobPerformanceSummary> entry : entries) {
+ String key = entry.getKey();
+ IJobPerformanceSummary jps = entry.getValue();
+ PerformanceMetricsSummaryItem value = new PerformanceMetricsSummaryItem(jps.getName(),jps.getUniqueName(),jps.getAnalysisTime(),jps.getNumProcessed(),jps.getAnalysisTimeMin(),jps.getAnalysisTimeMax());
+ map.putItem(key, value);
+ }
+ return map;
+ }
+
+ @Deprecated
+ private boolean legacy = true;
+
+ @Deprecated
+ private PerformanceMetricsSummaryMap readSer() {
+ PerformanceMetricsSummaryMap map = null;
+ if(legacy) {
+ try {
+ FileInputStream fis = new FileInputStream(filename);
+ ObjectInputStream in = new ObjectInputStream(fis);
+ summaryMap = (PerformanceMetricsSummaryMap)in.readObject();
+ in.close();
+ map = getSummaryMap();
+ }
+ catch(Exception e) {
+ System.err.println("PerformanceMetricsSummaryMap.readSer() could not read file: "+ filename);
+ }
+ }
+ return map;
+ }
+
public PerformanceMetricsSummaryMap readSummary() {
PerformanceMetricsSummaryMap map = null;
try {
- FileInputStream fis = new FileInputStream(filename);
- ObjectInputStream in = new ObjectInputStream(fis);
- summaryMap = (PerformanceMetricsSummaryMap)in.readObject();
- in.close();
- map = getSummaryMap();
+ map = readJsonGz();
+ return map;
}
catch(Exception e) {
- System.err.println("PerformanceMetricsSummaryMap.readSummary() could not read file: "+ filename);
+ if(!legacy) {
+ e.printStackTrace();
+ }
}
+ map = readSer();
return map;
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryWriter.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryWriter.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryWriter.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/jd/PerformanceSummaryWriter.java Tue Jan 15 17:11:11 2013
@@ -20,6 +20,12 @@ package org.apache.uima.ducc.transport.e
import java.io.FileOutputStream;
import java.io.ObjectOutputStream;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import org.apache.uima.ducc.common.jd.files.JobPerformanceSummary;
+import org.apache.uima.ducc.common.jd.files.JobPerformanceSummaryData;
public class PerformanceSummaryWriter extends PerformanceSummaryReader {
@@ -27,12 +33,53 @@ public class PerformanceSummaryWriter ex
super(dirname);
}
+ private void writeJsonGz() {
+ try {
+ ConcurrentSkipListMap<String, JobPerformanceSummary> map = new ConcurrentSkipListMap<String, JobPerformanceSummary>();
+ Set<Entry<String, PerformanceMetricsSummaryItem>> entries = summaryMap.entrySet();
+ for(Entry<String, PerformanceMetricsSummaryItem> entry : entries) {
+ PerformanceMetricsSummaryItem item = entry.getValue();
+ JobPerformanceSummary jps = new JobPerformanceSummary();
+ jps.setAnalysisTime(item.getAnalysisTime());
+ jps.setAnalysisTimeMax(item.getAnalysisTimeMax());
+ jps.setAnalysisTimeMin(item.getAnalysisTimeMin());
+ jps.setNumProcessed(item.getNumProcessed());
+ jps.setName(item.getName());
+ jps.setUniqueName(item.getUniqueName());
+ map.put(jps.getUniqueName(), jps);
+ }
+
+ Integer casCount = summaryMap.casCount();
+ JobPerformanceSummaryData data = new JobPerformanceSummaryData(map,casCount);
+ jsonGz.exportData(data);
+ }
+ catch(Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Deprecated
+ private boolean legacy = false;
+
+ @Deprecated
+ private void writeSer(PerformanceMetricsSummaryMap map) {
+ if(legacy) {
+ try {
+ FileOutputStream fos = new FileOutputStream(filename);
+ ObjectOutputStream out = new ObjectOutputStream(fos);
+ out.writeObject(map);
+ out.close();
+ }
+ catch(Exception e) {
+ System.err.println("PerformanceMetricsSummaryMap.writeSer() could not write file: "+ filename);
+ }
+ }
+ }
+
public void writeSummary() {
+ writeSer(summaryMap);
try {
- FileOutputStream fos = new FileOutputStream(filename);
- ObjectOutputStream out = new ObjectOutputStream(fos);
- out.writeObject(summaryMap);
- out.close();
+ writeJsonGz();
return;
}
catch(Exception e) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/IService.java Tue Jan 15 17:11:11 2013
@@ -75,7 +75,7 @@ public interface IService
Stop {
public String decode() { return "stop"; }
public String description() { return "Stop a registered service." ; }
- public String argname() { return "wervice-id-or-endpoint [--instances number-to-stop]" ; }
+ public String argname() { return "service-id-or-endpoint [--instances number-to-stop]" ; }
},
Modify {
public String decode() { return "modify"; }
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDependency.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDependency.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDependency.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDependency.java Tue Jan 15 17:11:11 2013
@@ -65,7 +65,15 @@ public class ServiceDependency implement
{
messages.put(endpoint, message);
}
-
+
+ /**
+ * This job/service is completing. Clear potenitally confusing messages that might be left over.
+ */
+ public void clearMessages()
+ {
+ messages.clear();
+ }
+
public Map<String, String> getMessages()
{
return messages;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java?rev=1433529&r1=1433528&r2=1433529&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/sm/ServiceDescription.java Tue Jan 15 17:11:11 2013
@@ -315,14 +315,11 @@ public class ServiceDescription
sb.append(stopped);
sb.append("\n");
- sb.append(" Queue Statistics: ");
+ sb.append(" Service Statistics: ");
if ( qstats == null ) {
sb.append("None\n");
} else {
- sb.append("\n ");
- sb.append(qstats.header());
- sb.append("\n");
- sb.append(" ");
+ sb.append("\n ");
sb.append(qstats.toString());
}
return sb.toString();