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/10/31 19:24:30 UTC
svn commit: r1537575 - in /uima/sandbox/uima-ducc/trunk: src/main/resources/
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
Author: burn
Date: Thu Oct 31 18:24:30 2013
New Revision: 1537575
URL: http://svn.apache.org/r1537575
Log:
UIMA-3397 Change CLI service property from --process_failures_limit to --instance_failures_limit
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/CliBase.java
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/DuccManagedReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.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/IUiOptions.java
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-submit.tex
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.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=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/resources/ducc.properties Thu Oct 31 18:24:30 2013
@@ -191,7 +191,6 @@ ducc.sm.state.update.endpoint.type=topic
ducc.sm.meta.ping.rate = 60000
ducc.sm.meta.ping.stability = 10
ducc.sm.meta.ping.timeout = 5000
-ducc.sm.instance.falure.max = 5
ducc.sm.http.port=19989
ducc.sm.http.node=${ducc.head}
ducc.sm.default.linger=300000
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java?rev=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/CliBase.java Thu Oct 31 18:24:30 2013
@@ -258,7 +258,7 @@ public abstract class CliBase
DuccProperties cli_props, IDuccCallback consoleCb, String servlet)
throws Exception
{
- CliFixups.cleanupArgs(args); // Default implementation does nothing
+ CliFixups.cleanupArgs(args, myClassName); // Default implementation does nothing
if ( init_done ) return;
@@ -408,7 +408,7 @@ public abstract class CliBase
*/
private void sanitize(Properties props, Options opts) {
- CliFixups.cleanupProps(props); // By default does nothing
+ CliFixups.cleanupProps(props, myClassName); // By default does nothing
for (String key : props.stringPropertyNames()) {
if (addedOptions.contains(key)) {
props.remove(key);
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=1537575&r1=1537574&r2=1537575&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 Thu Oct 31 18:24:30 2013
@@ -28,9 +28,9 @@ import java.util.Properties;
public class CliFixups {
- static void cleanupArgs(String[] args) {
+ static void cleanupArgs(String[] args, String className) {
}
- static void cleanupProps(Properties props) {
+ static void cleanupProps(Properties props, String className) {
}
}
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=1537575&r1=1537574&r2=1537575&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 Thu Oct 31 18:24:30 2013
@@ -48,7 +48,6 @@ public class DuccManagedReservationSubmi
UiOption.AttachConsole,
UiOption.ProcessExecutable,
UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
UiOption.ProcessMemorySize,
UiOption.SchedulingClass,
UiOption.Specification,
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java?rev=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceApi.java Thu Oct 31 18:24:30 2013
@@ -66,7 +66,7 @@ public class DuccServiceApi
UiOption.ProcessDD,
UiOption.ProcessExecutable,
UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
+ UiOption.InstanceFailuresLimit,
UiOption.ClasspathOrder,
// UiOption.Specification // not used for registration
UiOption.ServiceDependency,
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=1537575&r1=1537574&r2=1537575&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 Thu Oct 31 18:24:30 2013
@@ -57,7 +57,7 @@ public class DuccServiceSubmit
UiOption.ProcessDD,
UiOption.ProcessExecutable,
UiOption.ProcessExecutableArgs,
- UiOption.ProcessFailuresLimit,
+ UiOption.InstanceFailuresLimit,
UiOption.ClasspathOrder,
UiOption.Specification,
UiOption.ServiceDependency,
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=1537575&r1=1537574&r2=1537575&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 Thu Oct 31 18:24:30 2013
@@ -193,7 +193,15 @@ public interface IUiOptions
public String example() { return null; }
public String label() { return name(); }
},
-
+
+ InstanceFailuresLimit {
+ public String pname() { return "instance_failures_limit"; }
+ public String description() { return "Number of consecutive instance failures that will cause the service to be stopped."; }
+ public String argname() { return "integer"; }
+ public String example() { return null; }
+ public String deflt() { return "5"; }
+ public String label() { return "InstanceFailuresLimit"; }
+ },
JobId {
public String pname() { return JobRequestProperties.key_id; }
public String argname() { return "string"; }
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex?rev=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-services.tex Thu Oct 31 18:24:30 2013
@@ -173,16 +173,16 @@
\item[$--$process\_executable\_args {[list-of-arguments]}] For \hyperref[sec:services.types]{CUSTOM
services}, this specifies the program arguments, if any.
- \item[$--$process\_failures\_limit {[integer]}]
+ \item[$--$process\_memory\_size {[size]}] This specifies the maximum amount of RAM in GB to be
+ allocated to each Job Process. This value is used by the Resource Manager to allocate
+ resources.
+
+ \item[$--$instance\_failures\_limit {[integer]}]
This specifies the maximum number of consecutive individual service instance failures that are to be
tolerated before stopping the service. The default is five (5). If the instance is successfully
restarted, the count is reset to zero (0), so that the occasional process failure does not cause
the entire service to be terminated.
- \item[$--$process\_memory\_size {[size]}] This specifies the maximum amount of RAM in GB to be
- allocated to each Job Process. This value is used by the Resource Manager to allocate
- resources.
-
\item[$--$scheduling\_class {[classname]}] This specifies the name of the scheuling class the RM
will use to determine the resource allocation for each process. The names of the classes are
installation dependent. If not specified, the default is taken from the global DUCC
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=1537575&r1=1537574&r2=1537575&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 Thu Oct 31 18:24:30 2013
@@ -228,7 +228,7 @@
\item[$--$process\_failures\_limit {[integer]} ]
This specifies the maximum number of individual Job Process (JP) failures allowed
- before killing the job. The default is fifteen(15). If this limit is exceeded over the lifetime
+ before killing the job. The default is twenty(20). If this limit is exceeded over the lifetime
of a job DUCC terminates the entire job.
\begin{verbatim}
--process_failures_limit 23
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java?rev=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceManagerComponent.java Thu Oct 31 18:24:30 2013
@@ -259,7 +259,7 @@ public class ServiceManagerComponent
super.start(service, args);
DuccDaemonRuntimeProperties.getInstance().boot(DaemonName.ServiceManager,getProcessJmxUrl());
- failure_max = SystemPropertyResolver.getIntProperty("ducc.sm.instance.failure.max", failure_max);
+ // (UIMA-3397) failure_max = SystemPropertyResolver.getIntProperty("ducc.sm.instance.failure.max", failure_max);
meta_ping_rate = SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.rate", meta_ping_rate);
meta_ping_timeout = SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.timeout", meta_ping_timeout);
meta_ping_stability = SystemPropertyResolver.getIntProperty("ducc.sm.meta.ping.stability", meta_ping_stability);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1537575&r1=1537574&r2=1537575&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Thu Oct 31 18:24:30 2013
@@ -238,7 +238,7 @@ public class ServiceSet
this.service_state = ServiceState.NotAvailable;
this.linger_time = props.getLongProperty(RegistrationOption.ServiceLinger.decode(), 5000);
this.key = meta.getProperty("endpoint");
- this.failure_max = props.getIntProperty(UiOption.ProcessFailuresLimit.pname(), ServiceManagerComponent.failure_max);
+ this.failure_max = props.getIntProperty(UiOption.InstanceFailuresLimit.pname(), ServiceManagerComponent.failure_max);
parseEndpoint(key);