You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2013/11/15 23:14:29 UTC
svn commit: r1542420 - in /uima/sandbox/uima-ducc/trunk: src/main/resources/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/
uima-ducc-common/src/main/java/org/apache/uima/ducc/comm...
Author: burn
Date: Fri Nov 15 22:14:28 2013
New Revision: 1542420
URL: http://svn.apache.org/r1542420
Log:
UIMA-3401 Changed names & comments for some JD & CLI properties
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
Modified: uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties Fri Nov 15 22:14:28 2013
@@ -150,7 +150,7 @@ ducc.ws.jvm.args = -Xmx2G -Dja
# ========== CLI Configuration block ==========
# These environment values are included on job/service/AP submissions
-ducc.submit.environment.propagated = USER HOME LANG
+ducc.environment.propagated = USER HOME LANG
# No timeout on CLI requests
ducc.cli.httpclient.sotimeout=0
@@ -214,16 +214,16 @@ ducc.jd.host.user=System
# along with the size of the CR's type system, limits the number of active work-item CASes in a job.
# To avoid swapping the max heap size should also be restricted.
# Memory size in MB allocated for each JD (default 300)
-# BURN BURN BURN fix this jazz
ducc.jd.share.quantum = 400
-# Max number of work-item CASes for each job (unlimited?)
-ducc.submit.threads.limit = 500
-# Extra JVM args to be appended to every JD which should contain a default Xmx
-# less than the quantum size, but the user's request may override this.
-ducc.submit.driver.jvm.args=-Xmx300M
+# Max number of work-item CASes for each job (default is "unlimited")
+ducc.threads.limit = 500
+# Extra JVM args to be appended to any user-supplied "driver_jvm_args"
+# Note: should contain an Xmx a little below the "ducc.jd.share.quantum" value
+# the Xmx entry is ignored if the user has speccified one
+ducc.driver.jvm.args = -Xmx300M
-# BURN BURN BURN Comment this
-# ducc.submit.process.jvm.args=-XX:+HeapDumpOnOutOfMemoryError
+# Extra JVM args to be appended to any user-supplied "process_jvm_args"
+# ducc.process.jvm.args=-XX:+HeapDumpOnOutOfMemoryError
# ========== Job Driver Configuration block ==========
# ========== Service Manager Configuration block ==========
@@ -414,9 +414,8 @@ ducc.uima-as.saxon.jar.path=file:${DUCC_
# context file used to deploy UIMA-AS based service.
ducc.uima-as.dd2spring.xsl.path=${DUCC_HOME}/resources/dd2spring.xsl
-# Custom Flow Controller to use for Ducc Job Processes
-# BURN BURN BURN Rename this to ducc.flow-controller.specfier
-ducc.uima-as.flow-controller.specifier=org.apache.uima.ducc.common.uima.DuccJobProcessFC
+# Custom Flow Controller to use for Ducc Job Processes that don't provide a process_DD descriptor
+ducc.flow-controller.specifier=org.apache.uima.ducc.common.uima.DuccJobProcessFC
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccJobSubmit.java Fri Nov 15 22:14:28 2013
@@ -257,22 +257,6 @@ public class DuccJobSubmit
}
}
-
- //**********
-
- private String getDuccProperty(String propertyName, String defaultValue) {
- String propertyValue = defaultValue;
- try {
- String value = DuccPropertiesResolver.getInstance().getProperty(propertyName);
- if(value != null) {
- propertyValue = value;
- }
- }
- catch(Throwable t) {
- message(t.toString());
- }
- return propertyValue;
- }
//**********
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java Fri Nov 15 22:14:28 2013
@@ -73,7 +73,7 @@ public class DuccUiUtilities {
}
// Augment user-specified environment with a few useful ones (only if not already set), e.g. USER HOME
// If an augmented value contains a blank add single or double quotes
- String envNames = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_submit_environment_propagated);
+ String envNames = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_environment_propagated);
if (envNames != null) {
for (String name : envNames.split("\\s+")) {
if (!envMap.containsKey(name)) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/uima/UimaUtils.java Fri Nov 15 22:14:28 2013
@@ -58,7 +58,7 @@ import org.apache.uima.util.XMLInputSour
public class UimaUtils {
public static final String FlowControllerKey="FixedFlowController";
- public static final String FlowControllerResourceSpecifier="ducc.uima-as.flow-controller.specifier";
+ public static final String FlowControllerResourceSpecifier="ducc.flow-controller.specifier";
public static RelativePathResolver resolver = new RelativePathResolver_impl();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccPropertiesResolver.java Fri Nov 15 22:14:28 2013
@@ -59,12 +59,10 @@ public class DuccPropertiesResolver {
}
- public static final String ducc_submit_beta = "ducc.submit.beta";
-
- public static final String ducc_submit_threads_limit = "ducc.submit.threads.limit";
- public static final String ducc_submit_driver_jvm_args = "ducc.submit.driver.jvm.args";
- public static final String ducc_submit_process_jvm_args = "ducc.submit.process.jvm.args";
- public static final String ducc_submit_environment_propagated = "ducc.submit.environment.propagated";
+ public static final String ducc_threads_limit = "ducc.threads.limit";
+ public static final String ducc_driver_jvm_args = "ducc.driver.jvm.args";
+ public static final String ducc_process_jvm_args = "ducc.process.jvm.args";
+ public static final String ducc_environment_propagated = "ducc.environment.propagated";
public static final String ducc_runmode = "ducc.runmode";
public static final String ducc_signature_required = "ducc.signature.required";
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1542420&r1=1542419&r2=1542420&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java Fri Nov 15 22:14:28 2013
@@ -314,7 +314,7 @@ public class JobFactory {
}
}
// Add any site-provided JVM args, but not -Xmx if the user has provided one
- String siteJvmArgs = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_submit_driver_jvm_args);
+ String siteJvmArgs = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_driver_jvm_args);
dTokens = QuotedOptions.tokenizeList(siteJvmArgs, true); // a null arg is acceptable
for (String token : dTokens) {
if (!haveXmx || !token.startsWith("-Xmx")) {
@@ -350,7 +350,7 @@ public class JobFactory {
private void checkSchedulingLimits(DuccWorkJob job, DuccSchedulingInfo schedulingInfo) {
String methodName = "checkSpec";
long limit = 0;
- String p_limit = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_submit_threads_limit);
+ String p_limit = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_threads_limit);
if (p_limit != null) {
if (!p_limit.equals("unlimited")) {
limit = Long.parseLong(p_limit);
@@ -540,7 +540,7 @@ public class JobFactory {
pipelineCommandLine.addOption(token);
}
// Add any site-provided JVM args
- String siteJvmArgs = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_submit_process_jvm_args);
+ String siteJvmArgs = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_process_jvm_args);
pTokens = QuotedOptions.tokenizeList(siteJvmArgs, true); // a null arg is acceptable
for(String token : pTokens) {
pipelineCommandLine.addOption(token);