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/14 15:16:35 UTC
svn commit: r1541914 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/
Author: burn
Date: Thu Nov 14 14:16:35 2013
New Revision: 1541914
URL: http://svn.apache.org/r1541914
Log:
UIMA-3430 Restrict memory size to an integer
Modified:
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/IUiOptions.java
uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex
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=1541914&r1=1541913&r2=1541914&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 Nov 14 14:16:35 2013
@@ -389,6 +389,11 @@ public abstract class CliBase
&& !val.equals(ClasspathOrderParms.UserBeforeDucc.pname())) {
throw new IllegalArgumentException("Invalid value for " + uiopt.pname() + ": " + val);
}
+ } else if (uiopt == UiOption.ProcessMemorySize || uiopt == UiOption.ReservationMemorySize) {
+ String val = cli_props.getStringProperty(uiopt.pname());
+ if (!val.matches("^\\d+$")) {
+ throw new IllegalArgumentException("Invalid non-numeric value for " + uiopt.pname() + ": " + val);
+ }
}
}
// If this request accepts the --environment option may need to augment it by
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=1541914&r1=1541913&r2=1541914&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 Nov 14 14:16:35 2013
@@ -511,7 +511,7 @@ public interface IUiOptions
public String pname() { return JobSpecificationProperties.key_process_memory_size; }
public String argname() { return "size-in-GB"; }
public String description() { return "Maximum memory for each process, in GB."; }
- public String example() { return null; }
+ public String example() { return "30"; }
public String label() { return "ProcessMemorySize"; }
},
@@ -551,9 +551,9 @@ public interface IUiOptions
ReservationMemorySize {
public String pname() { return ReservationSpecificationProperties.key_instance_memory_size; }
- public String argname() { return "size[KB|MB|GB|TB]"; }
- public String description() { return "Size of instance's memory, defaults to GB if units omitted."; }
- public String example() { return "64GB"; }
+ public String argname() { return "size-in-GB"; }
+ public String description() { return "Size of instance's memory, in GB."; }
+ public String example() { return "64"; }
public String label() { return name(); }
public boolean required() { return true; }
},
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex?rev=1541914&r1=1541913&r2=1541914&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-duccdocs/src/site/tex/duccbook/part2/cli/ducc-reserve.tex Thu Nov 14 14:16:35 2013
@@ -53,8 +53,8 @@
\item[$--$help ]
Prints the usage text to the console.
- \item[$--$instance\_memory\_size {[KB|MB|GB|TB]}]]
- This specifies the amount of memory the reserved machine must supoprt. For full machine
+ \item[$--$instance\_memory\_size {[integer]}]
+ This specifies the amount of memory the reserved machine must support. For full machine
reservations, this is the total memory on the machine. For partial reservations, the machine
may have more memory, but not less than is specified.
@@ -75,7 +75,7 @@
\paragraph{Notes:}
Reservations may be for full machines, or partial machines based on memory. The mechanism for
- distinguishing which type of reservation the job class. A job class implementing the RESERVE
+ distinguishing which type of reservation is the job class. A job class implementing the RESERVE
scheduling policy results in a full machine being reserved. A job clas simplementing the FIXED
scheduling policy results in a partial machine being reserved. The default DUCC distribution
configures class {\em reserve} for full machine reservations, and class {\em fixed} for partial