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 2015/06/24 15:31:14 UTC
svn commit: r1687263 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Author: degenaro
Date: Wed Jun 24 13:31:14 2015
New Revision: 1687263
URL: http://svn.apache.org/r1687263
Log:
UIMA-4478 DUCC Orchestrator (OR) should record requests to cancel job, reservation, or service
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1687263&r1=1687262&r2=1687263&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Wed Jun 24 13:31:14 2015
@@ -103,6 +103,7 @@ implements Orchestrator {
// Springframework magic to inject instance of {@link CommonConfiguration}
@Autowired CommonConfiguration common;
private static final DuccLogger logger = DuccLoggerComponents.getOrLogger(OrchestratorComponent.class.getName());
+ private static DuccId jobid = null;
private OrchestratorCommonArea orchestratorCommonArea = OrchestratorCommonArea.getInstance();
private Messages messages = orchestratorCommonArea.getSystemMessages();
@@ -115,7 +116,7 @@ implements Orchestrator {
private CommonConfiguration commonConfiguration = orchestratorCommonArea.getCommonConfiguration();
private JobDriverHostManager hostManager = orchestratorCommonArea.getHostManager();
private StateJobAccounting stateJobAccounting = StateJobAccounting.getInstance();
-
+
public OrchestratorComponent(CamelContext context) {
super("Orchestrator", context);
}
@@ -622,6 +623,7 @@ implements Orchestrator {
}
else if(Validate.request(duccEvent)) {
String jobId = properties.getProperty(JobRequestProperties.key_id);
+ logger.info(methodName, jobid, JobRequestProperties.key_id+"="+jobId);
long t0 = System.currentTimeMillis();
DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, DuccType.Job, jobId, this, methodName);
long t1 = System.currentTimeMillis();
@@ -850,6 +852,7 @@ implements Orchestrator {
}
else {
String id = properties.getProperty(ReservationRequestProperties.key_id);
+ logger.info(methodName, jobid, ReservationRequestProperties.key_id+"="+id);
long t0 = System.currentTimeMillis();
DuccWorkReservation duccWorkReservation = (DuccWorkReservation) WorkMapHelper.findDuccWork(workMap, DuccType.Reservation, id, this, methodName);
long t1 = System.currentTimeMillis();
@@ -986,6 +989,7 @@ implements Orchestrator {
else if(Validate.request(duccEvent)) {
// update state
String jobId = properties.getProperty(JobRequestProperties.key_id);
+ logger.info(methodName, jobid, JobRequestProperties.key_id+"="+jobId);
long t0 = System.currentTimeMillis();
DuccWorkJob duccWorkJob = (DuccWorkJob) WorkMapHelper.findDuccWork(workMap, DuccType.Service, jobId, this, methodName);
long t1 = System.currentTimeMillis();