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/02/15 13:12:26 UTC
svn commit: r1568625 - in /uima/sandbox/uima-ducc/trunk:
src/main/resources/ducc.properties
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
Author: degenaro
Date: Sat Feb 15 12:12:25 2014
New Revision: 1568625
URL: http://svn.apache.org/r1568625
Log:
UIMA-3620 DUCC Orchestrator (OR) should dynamically discover site jvm args for JD and JPs from ducc.properties
Modified:
uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties
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=1568625&r1=1568624&r2=1568625&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties Sat Feb 15 12:12:25 2014
@@ -218,11 +218,13 @@ ducc.jd.share.quantum = 400
# 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"
+# Dynamic: changes to this property immediately affect new submitted work
# 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
# Extra JVM args to be appended to any user-supplied "process_jvm_args"
+# Dynamic: changes to this property immediately affect new submitted work
# ducc.process.jvm.args=-XX:+HeapDumpOnOutOfMemoryError
# ========== Job Driver Configuration block ==========
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=1568625&r1=1568624&r2=1568625&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 Sat Feb 15 12:12:25 2014
@@ -334,7 +334,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_driver_jvm_args);
+ String siteJvmArgs = DuccPropertiesResolver.getInstance().getFileProperty(DuccPropertiesResolver.ducc_driver_jvm_args);
dTokens = QuotedOptions.tokenizeList(siteJvmArgs, true); // a null arg is acceptable
for (String token : dTokens) {
if (!haveXmx || !token.startsWith("-Xmx")) {
@@ -560,7 +560,7 @@ public class JobFactory {
pipelineCommandLine.addOption(token);
}
// Add any site-provided JVM args
- String siteJvmArgs = DuccPropertiesResolver.get(DuccPropertiesResolver.ducc_process_jvm_args);
+ String siteJvmArgs = DuccPropertiesResolver.getInstance().getFileProperty(DuccPropertiesResolver.ducc_process_jvm_args);
pTokens = QuotedOptions.tokenizeList(siteJvmArgs, true); // a null arg is acceptable
for(String token : pTokens) {
pipelineCommandLine.addOption(token);