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/03/24 20:57:01 UTC
svn commit: r1668974 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkPopDriver.java
Author: degenaro
Date: Tue Mar 24 19:57:01 2015
New Revision: 1668974
URL: http://svn.apache.org/r1668974
Log:
UIMA-4304 DUCC Web Orchestrator (OR) should no longer employ ducc.rm.state.publish.rate
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkPopDriver.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1668974&r1=1668973&r2=1668974&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Tue Mar 24 19:57:01 2015
@@ -381,13 +381,6 @@ public class JobFactory implements IJobF
addDashD(jcl, flagName, flagValue);
}
- private String getDuccFileProperty(String key) {
- String location = "getDuccFileProperty";
- String value = DuccPropertiesResolver.getInstance().getFileProperty(key);
- logger.trace(location, null, key+"="+value);
- return value;
- }
-
private void createDriver(CommonConfiguration common, JobRequestProperties jobRequestProperties, DuccWorkJob job) {
String methodName = "createDriver";
DuccPropertiesResolver duccPropertiesResolver = DuccPropertiesResolver.getInstance();
@@ -408,26 +401,8 @@ public class JobFactory implements IJobF
}
// Exception handler
String processExceptionHandler = jobRequestProperties.getProperty(JobRequestProperties.key_driver_exception_handler);
- // ProcessStatusMaxWaitMillis
- long processStatusMaxWaitMillis = -1;
- try {
- String ducc_orchestrator_abbreviated_state_publish_rate = getDuccFileProperty(DuccPropertiesResolver.ducc_orchestrator_abbreviated_state_publish_rate);
- String ducc_rm_state_publish_rate = getDuccFileProperty(DuccPropertiesResolver.ducc_rm_state_publish_rate);
- String ducc_agent_node_metrics_publish_rate = getDuccFileProperty(DuccPropertiesResolver.ducc_agent_node_metrics_publish_rate);
- String ducc_rm_node_stability = getDuccFileProperty(DuccPropertiesResolver.ducc_rm_node_stability);
- long orMillisRate = Long.parseLong(ducc_orchestrator_abbreviated_state_publish_rate);
- long rmMillisRate = Long.parseLong(ducc_rm_state_publish_rate);
- long metricsMillisRate = Long.parseLong(ducc_agent_node_metrics_publish_rate);
- long stabilityCount = Long.parseLong(ducc_rm_node_stability);
- long fudgeMillis = 10 * 1000;
- processStatusMaxWaitMillis = metricsMillisRate*stabilityCount+(orMillisRate+rmMillisRate+fudgeMillis);
- logger.debug(methodName, job.getDuccId(), "driver:processStatusMaxWaitMillis="+processStatusMaxWaitMillis);
- }
- catch(Exception e) {
- logger.error(methodName, job.getDuccId(), e);
- }
// Command line
- DuccWorkPopDriver driver = new DuccWorkPopDriver(job.getjobBroker(), job.getjobQueue(), crxml, crcfg, meta_time, lost_time, wi_time, processExceptionHandler, processStatusMaxWaitMillis);
+ DuccWorkPopDriver driver = new DuccWorkPopDriver(job.getjobBroker(), job.getjobQueue(), crxml, crcfg, meta_time, lost_time, wi_time, processExceptionHandler);
JavaCommandLine driverCommandLine = buildJobDriverCommandLine(jobRequestProperties, job.getDuccId());
// Environment
String driverEnvironmentVariables = jobRequestProperties.getProperty(JobSpecificationProperties.key_environment);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkPopDriver.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/DuccWorkPopDriver.java?rev=1668974&r1=1668973&r2=1668974&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkPopDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkPopDriver.java Tue Mar 24 19:57:01 2015
@@ -33,9 +33,7 @@ public class DuccWorkPopDriver extends D
private String wiTimeout = null;
private String processExceptionHandler = null;
- private long processStatusMaxWaitMillis = (5*60*1000)+(1*1000);
-
- public DuccWorkPopDriver(String serverUri, String endPoint, String cr, String crConfig, String metaTimeout, String lostTimeout, String wiTimeout, String processExceptionHandler, long processStatusMaxWaitMillis) {
+ public DuccWorkPopDriver(String serverUri, String endPoint, String cr, String crConfig, String metaTimeout, String lostTimeout, String wiTimeout, String processExceptionHandler) {
this.serverUri = serverUri;
this.endPoint = endPoint;
this.cr = cr;
@@ -44,9 +42,6 @@ public class DuccWorkPopDriver extends D
this.lostTimeout = lostTimeout;
this.wiTimeout = wiTimeout;
this.processExceptionHandler = processExceptionHandler;
- if(processStatusMaxWaitMillis >= 0) {
- this.processStatusMaxWaitMillis = processStatusMaxWaitMillis;
- }
}
public String getServerUri() {
@@ -80,8 +75,4 @@ public class DuccWorkPopDriver extends D
public String getProcessExceptionHandler() {
return processExceptionHandler;
}
-
- public long getProcessStatusMaxWaitMillis() {
- return processStatusMaxWaitMillis;
- }
}