Author: burn
Date: Fri Oct 2 22:39:11 2015
New Revision: 1706501
URL: http://svn.apache.org/viewvc?rev=1706501&view=rev
Log:
UIMA-4625 Change option process_thread_count to process_pipeline_count
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java
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/DuccManagedReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccCasInputSpec.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccRawTextSpec.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/driver/driver.py
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
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/cli/JobRequestProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliFixups.java
Fri Oct 2 22:39:11 2015
@@ -37,6 +37,9 @@ import org.apache.uima.ducc.common.utils
*
* Additionally since services registered under DUCC 1.x may be relying on
UIMA jars that are no longer supplied,
* their classpath will be augmented ... triggered by the deprecated
classpath_order option.
+ *
+ * For DUCC 2.1.0 changed (without warning):
+ * process_thread_count -> process_pipeline_count
*/
public class CliFixups {
@@ -58,6 +61,9 @@ public class CliFixups {
System.out.println("CLI ignored deprecated option: " + arg);
args[i] = null;
if (++i < args.length && !args[i].startsWith("--")) args[i] =
null;
+ } else if (arg.equals("--process_thread_count")) {
+ args[i] = "--process_pipeline_count";
+ System.out.println("CLI replaced deprecated option: " + arg +
" with: " + args[i]);
}
}
}
@@ -86,6 +92,7 @@ public class CliFixups {
changeOption("instance_memory_size", "memory_size", props);
changeOption("classpath_order", null, props);
changeOption("number_of_instances", null, props);
+ changeOption("process_thread_count", "process_pipeline_count", props);
}
static private void changeOption(String oldKey, String newKey,
Properties props) {
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=1706501&r1=1706500&r2=1706501&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 Oct 2 22:39:11 2015
@@ -77,7 +77,7 @@ public class DuccJobSubmit
UiOption.ProcessDeploymentsMax,
UiOption.ProcessInitializationFailuresCap,
UiOption.ProcessFailuresLimit,
- UiOption.ProcessThreadCount,
+ UiOption.ProcessPipelineCount,
UiOption.ProcessPerItemTimeMax,
UiOption.ProcessGetMetaTimeMax,
UiOption.ProcessInitializationTimeMax,
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccManagedReservationSubmit.java
Fri Oct 2 22:39:11 2015
@@ -163,7 +163,7 @@ public class DuccManagedReservationSubmi
// Create a copy to be saved later without these 3 "ducclet"
properties required by DUCC
ServiceRequestProperties serviceProperties =
(ServiceRequestProperties)serviceRequestProperties.clone();
-
serviceRequestProperties.setProperty(UiOption.ProcessThreadCount.pname(), "1");
+
serviceRequestProperties.setProperty(UiOption.ProcessPipelineCount.pname(),
"1");
serviceRequestProperties.setProperty(UiOption.ProcessDeploymentsMax.pname(),
"1");
serviceRequestProperties.setProperty(UiOption.ServiceTypeOther.pname(), "");
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
Fri Oct 2 22:39:11 2015
@@ -243,7 +243,7 @@ public class DuccServiceSubmit
enrich_parameters_for_debug(requestProperties);
}
- requestProperties.put(UiOption.ProcessThreadCount.pname(), "1");
// enforce this - OR will complain if it's missing
+ requestProperties.put(UiOption.ProcessPipelineCount.pname(), "1");
// enforce this - OR will complain if it's missing
SubmitServiceDuccEvent ev = new
SubmitServiceDuccEvent(requestProperties, CliVersion.getVersion());
SubmitServiceReplyDuccEvent reply = null;
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiConstants.java
Fri Oct 2 22:39:11 2015
@@ -338,7 +338,7 @@ public class DuccUiConstants {
public static final String exmp_process_failures_limit = "20";
public static final String dval_process_failures_limit = "20";
- public static final String name_process_thread_count =
JobSpecificationProperties.key_process_thread_count;
+ public static final String name_process_thread_count =
JobSpecificationProperties.key_process_pipeline_count;
public static final String parm_process_thread_count = "integer";
public static final String desc_process_thread_count = "Number of
pipelines per deployment (i.e. UIMA pipelines per UIMA-AS service copy).";
public static final String labl_process_thread_count = "Threads";
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/IUiOptions.java
Fri Oct 2 22:39:11 2015
@@ -515,9 +515,9 @@ public interface IUiOptions
public String example() { return "30"; }
},
- ProcessThreadCount {
- public String pname() { return
JobSpecificationProperties.key_process_thread_count; }
- public String description() { return "Number of pipelines per
deployment (i.e. UIMA pipelines per UIMA-AS service copy)."; }
+ ProcessPipelineCount {
+ public String pname() { return
JobSpecificationProperties.key_process_pipeline_count; }
+ public String description() { return "Number of pipelines per
process (i.e. simultaneously processed work-items)."; }
public String argname() { return "integer"; }
public String deflt() { return "4"; }
},
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
Fri Oct 2 22:39:11 2015
@@ -288,14 +288,16 @@ ducc.submit.environment.propagated
--process_per_item_time_max 60
\end{verbatim}
- \item[$--$process\_thread\_count {[integer]} ] This specifies the
number of threads per
- process to be deployed. It is used by the Resource Manager to
determine how many
+ \item[$--$process\_pipeline\_count {[integer]} ] This specifies the
number of pipelines per
+ process to be deployed, i.e. the number of work-items each JP
will process simultaneously.
+ It is used by the Resource Manager to determine how many
processes are needed, by the Job Process wrapper to determine how
many threads to
spawn, and by the Job Driver to determine how many CASs to
dispatch. If not specified,
the default is 4. Example:
\begin{verbatim}
---process_thread_count 7
+--process_pipeline_count 7
\end{verbatim}
+ Alias: $--$process\_thread\_count
\item[$--$scheduling\_class {[classname]} ] This specifies the name
of the scheduling class
the RM will use to determine the resource allocation for each
process. The names of the
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccCasInputSpec.job
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccCasInputSpec.job?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccCasInputSpec.job
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccCasInputSpec.job
Fri Oct 2 22:39:11 2015
@@ -22,7 +22,7 @@ process_descriptor_CM org.apache.uima.
process_descriptor_AE org.apache.uima.ducc.sampleapps.DuccSampleAE
process_descriptor_CC org.apache.uima.ducc.sampleapps.DuccCasCC
process_memory_size 2
-process_thread_count 8
+process_pipeline_count 8
process_deployments_max 4
process_jvm_args -Xmx1G -XX:+UseCompressedOops
scheduling_class normal
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccRawTextSpec.job
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccRawTextSpec.job?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccRawTextSpec.job
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/org/apache/uima/ducc/sampleapps/DuccRawTextSpec.job
Fri Oct 2 22:39:11 2015
@@ -22,7 +22,7 @@ process_descriptor_CM org.apac
process_descriptor_AE ${OPENNLP_HOME}/desc/OpenNlpTextAnalyzer.xml
process_descriptor_CC org.apache.uima.ducc.sampleapps.DuccCasCC
process_memory_size 4
-process_thread_count 8
+process_pipeline_count 8
process_jvm_args -Xmx3G -XX:+UseCompressedOops
-Djava.util.logging.config.file=${MyAppDir}/ConsoleLogger.properties
-Duima.datapath=${OPENNLP_HOME}/models
scheduling_class normal
working_directory ${MyAppDir}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.dd.job
Fri Oct 2 22:39:11 2015
@@ -27,7 +27,7 @@ process_descriptor_DD org.apach
process_memory_size 2
classpath
${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/*:${DUCC_HOME}/apache-uima/apache-activemq/lib/*:${DUCC_HOME}/apache-uima/apache-activemq/lib/optional/*
process_jvm_args -Xmx100M
-process_thread_count 2
+process_pipeline_count 2
process_per_item_time_max 5
environment AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0
LD_LIBRARY_PATH=/yet/a/nother/dumb/path
process_deployments_max 999
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/1.job
Fri Oct 2 22:39:11 2015
@@ -26,7 +26,7 @@ process_descriptor_AE org.apach
process_memory_size 2
classpath
${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/*
process_jvm_args -Xmx100M
-process_thread_count 2
+process_pipeline_count 2
process_per_item_time_max 5
environment AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0
LD_LIBRARY_PATH=/yet/a/nother/dumb/path
process_deployments_max 999
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/resources/sleepjobs/2.job
Fri Oct 2 22:39:11 2015
@@ -26,7 +26,7 @@ process_descriptor_AE org.apach
process_memory_size 2
classpath ${DUCC_HOME}/lib/uima-ducc/examples/*
process_jvm_args -Xmx16G
-process_thread_count 2
+process_pipeline_count 2
process_per_item_time_max 5
environment AE_INIT_TIME=5 AE_INIT_RANGE=5 INIT_ERROR=0
LD_LIBRARY_PATH=/yet/a/nother/dumb/path PROCESS_BLOAT=10
process_deployments_max 999
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
(original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
Fri Oct 2 22:39:11 2015
@@ -257,7 +257,7 @@ class DuccProcess(Thread):
CMD = CMD + ' --classpath ' +
self.runner.examples_classpath
CMD = CMD + ' --process_jvm_args ' +
jvm_process_args
- CMD = CMD + ' --process_thread_count ' + nthreads
+ CMD = CMD + ' --process_pipeline_count ' + nthreads
CMD = CMD + ' --scheduling_class ' + pclass
CMD = CMD + ' --process_per_item_time_max ' +
self.runner.process_timeout # in minutes
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/driver/driver.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/driver/driver.py?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/driver/driver.py
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/driver/driver.py
Fri Oct 2 22:39:11 2015
@@ -134,7 +134,7 @@ class RunJob(Thread,Config):
spArgs.append(self.helper.getClass())
spArgs.append('--process_memory_size')
spArgs.append(self.helper.getMemory())
- spArgs.append('--process_thread_count')
+ spArgs.append('--process_pipeline_count')
spArgs.append(self.helper.getThreads())
spArgs.append('--log_directory')
subdir = str(randint(1,1000000000))
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/Validate.java
Fri Oct 2 22:39:11 2015
@@ -115,7 +115,7 @@ public class Validate {
//
retVal = integer(retVal,
properties,
-
JobSpecificationProperties.key_process_thread_count,
+
JobSpecificationProperties.key_process_pipeline_count,
IDuccSchedulingInfo.defaultThreadsPerProcess,
IDuccSchedulingInfo.minThreadsPerProcess);
// scheduling class
@@ -213,7 +213,7 @@ public class Validate {
//
retVal = integer(retVal,
properties,
-
JobSpecificationProperties.key_process_thread_count,
+
JobSpecificationProperties.key_process_pipeline_count,
IDuccSchedulingInfo.defaultThreadsPerProcess,
IDuccSchedulingInfo.minThreadsPerProcess);
// scheduling class
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=1706501&r1=1706500&r2=1706501&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
Fri Oct 2 22:39:11 2015
@@ -327,7 +327,7 @@ public class JobFactory implements IJobF
addDashD(jcl, FlagsHelper.Name.JpDdName, name);
//TODO
addDashD(jcl, FlagsHelper.Name.JpDdDescription, description);
- addDashD(jcl, FlagsHelper.Name.JpThreadCount,
jobRequestProperties.getProperty(JobSpecificationProperties.key_process_thread_count));
+ addDashD(jcl, FlagsHelper.Name.JpThreadCount,
jobRequestProperties.getProperty(JobSpecificationProperties.key_process_pipeline_count));
addDashD(jcl, FlagsHelper.Name.JpDdBrokerURL,
FlagsHelper.Name.JpDdBrokerURL.getDefaultValue());
addDashD(jcl, FlagsHelper.Name.JpDdBrokerEndpoint,
FlagsHelper.Name.JpDdBrokerEndpoint.getDefaultValue());
//
@@ -564,7 +564,7 @@ public class JobFactory implements IJobF
schedulingInfo.setSchedulingPriority(jobRequestProperties.getProperty(JobSpecificationProperties.key_scheduling_priority));
schedulingInfo.setProcessesMax(jobRequestProperties.getProperty(JobSpecificationProperties.key_process_deployments_max));
schedulingInfo.setProcessesMin(jobRequestProperties.getProperty(JobSpecificationProperties.key_process_deployments_min));
-
schedulingInfo.setThreadsPerProcess(jobRequestProperties.getProperty(JobSpecificationProperties.key_process_thread_count));
+
schedulingInfo.setThreadsPerProcess(jobRequestProperties.getProperty(JobSpecificationProperties.key_process_pipeline_count));
schedulingInfo.setMemorySizeRequested(jobRequestProperties.getProperty(JobSpecificationProperties.key_process_memory_size));
schedulingInfo.setMemoryUnits(MemoryUnits.GB);
@@ -665,7 +665,7 @@ public class JobFactory implements IJobF
addDashD(pipelineCommandLine,
FlagsHelper.Name.JpType, "uima");
}
- String process_thread_count =
jobRequestProperties.getProperty(JobSpecificationProperties.key_process_thread_count);
+ String process_thread_count =
jobRequestProperties.getProperty(JobSpecificationProperties.key_process_pipeline_count);
if(process_thread_count != null) {
addDashD(pipelineCommandLine,
FlagsHelper.Name.JpThreadCount, process_thread_count);
}
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.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/JobRequestProperties.java?rev=1706501&r1=1706500&r2=1706501&view=diff
==============================================================================
---
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
(original)
+++
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobRequestProperties.java
Fri Oct 2 22:39:11 2015
@@ -75,7 +75,7 @@ public class JobRequestProperties extend
key_process_deployments_min,
key_process_initialization_failures_cap,
key_process_failures_limit,
- key_process_thread_count,
+ key_process_pipeline_count,
/*
key_process_get_meta_time_max,
*/
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=1706501&r1=1706500&r2=1706501&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
Fri Oct 2 22:39:11 2015
@@ -64,7 +64,7 @@ public class JobSpecificationProperties
public static String key_process_deployments_min =
"process_deployments_min";
public static String key_process_initialization_failures_cap =
"process_initialization_failures_cap";
public static String key_process_failures_limit =
"process_failures_limit";
- public static String key_process_thread_count = "process_thread_count";
+ public static String key_process_pipeline_count =
"process_pipeline_count";
/*
public static String key_process_get_meta_time_max =
"process_get_meta_time_max";
@@ -111,7 +111,7 @@ public class JobSpecificationProperties
key_process_deployments_min,
key_process_initialization_failures_cap,
key_process_failures_limit,
- key_process_thread_count,
+ key_process_pipeline_count,
key_process_initialization_time_max,
key_process_per_item_time_max,
key_service_dependency,
