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 2013/05/04 13:06:22 UTC
svn commit: r1479075 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
Author: degenaro
Date: Sat May 4 11:06:22 2013
New Revision: 1479075
URL: http://svn.apache.org/r1479075
Log:
UIMA-2854 DUCC command line interface(CLI) should choose appropriate "fixed" class for submission when all-in-one or debug flag is specified
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java?rev=1479075&r1=1479074&r2=1479075&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/aio/AllInOneLauncher.java Sat May 4 11:06:22 2013
@@ -453,7 +453,7 @@ public class AllInOneLauncher extends Cl
mh.frameworkTrace(cid, mid, exit);
}
- private void examine_scheduling_class() {
+ private void examine_scheduling_class() throws MissingArgumentException {
String mid = "examine_scheduling_class";
mh.frameworkTrace(cid, mid, enter);
String pname = UiOption.SchedulingClass.pname();
@@ -463,22 +463,25 @@ public class AllInOneLauncher extends Cl
used(pname);
}
else {
+ String user_scheduling_class = jobRequestProperties.getProperty(pname);
+ if(user_scheduling_class == null) {
+ throw new MissingArgumentException(pname);
+ }
DuccSchedulerClasses duccSchedulerClasses = DuccSchedulerClasses.getInstance();
- if(jobRequestProperties.containsKey(pname)) {
- String user_scheduling_class = jobRequestProperties.getProperty(pname);
- if(duccSchedulerClasses.isPreemptable(user_scheduling_class)) {
- scheduling_class = duccSchedulerClasses.getDebugClassSpecificName(user_scheduling_class);
- if(scheduling_class != null) {
- String message = pname+"="+scheduling_class+" [replacement, specific]";
- mh.frameworkDebug(cid, mid, message);
- used(pname);
- }
- else {
- scheduling_class = duccSchedulerClasses.getDebugClassDefaultName();
- String message = pname+"="+scheduling_class+" [replacement, default]";
- mh.frameworkDebug(cid, mid, message);
- used(pname);
- }
+ if(duccSchedulerClasses.isPreemptable(user_scheduling_class)) {
+ String default_scheduling_class = duccSchedulerClasses.getDebugClassDefaultName();
+ String specific_scheduling_class = duccSchedulerClasses.getDebugClassSpecificName(user_scheduling_class);
+ if(specific_scheduling_class != null) {
+ scheduling_class = specific_scheduling_class;
+ String message = pname+"="+scheduling_class+" [replacement, specific]";
+ mh.frameworkDebug(cid, mid, message);
+ used(pname);
+ }
+ else if(default_scheduling_class != null) {
+ scheduling_class = default_scheduling_class;
+ String message = pname+"="+scheduling_class+" [replacement, default]";
+ mh.frameworkDebug(cid, mid, message);
+ used(pname);
}
else {
scheduling_class = user_scheduling_class;
@@ -487,12 +490,6 @@ public class AllInOneLauncher extends Cl
used(pname);
}
}
- else {
- scheduling_class = duccSchedulerClasses.getDebugClassDefaultName();
- String message = pname+"="+scheduling_class+" [default]";
- mh.frameworkDebug(cid, mid, message);
- used(pname);
- }
}
mh.frameworkTrace(cid, mid, exit);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java?rev=1479075&r1=1479074&r2=1479075&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-common/src/main/java/org/apache/uima/ducc/common/utils/DuccSchedulerClasses.java Sat May 4 11:06:22 2013
@@ -86,50 +86,35 @@ public class DuccSchedulerClasses {
}
public String getDebugClassDefaultName() {
- String name = "";
+ String retVal = null;
Properties properties = getClasses();
- String value = properties.getProperty("scheduling.default.name.debug");
+ String key = "scheduling.default.name.debug";
+ String value = properties.getProperty(key);
if(value != null) {
- name = value.trim();
+ value = value.trim();
+ if(value.length() > 0) {
+ retVal = value;
+ }
}
- return name;
+ return retVal;
}
public String getDebugClassSpecificName(String class_name) {
String retVal = null;
if(class_name != null) {
Properties properties = getClasses();
- String name = properties.getProperty("scheduling.class."+class_name+".debug", "");
- if(name.equals("")) {
- name = getDebugClassDefaultName();
- if(name.equals("")) {
+ String key = "scheduling.class."+class_name+".debug";
+ String value = properties.getProperty(key);
+ if(value != null) {
+ value = value.trim();
+ if(value.length() > 0) {
+ retVal = value;
}
- else {
- retVal = name;
- }
- }
- else {
- retVal = name;
}
}
return retVal;
}
- public String getDebugClassName(String class_name) {
- String retVal = null;
- if(isPreemptable(class_name)) {
- String name = getDebugClassSpecificName(class_name);
- if(name == null) {
- name = getDebugClassDefaultName();
- }
- retVal = name;
- }
- else {
- retVal = class_name;
- }
- return retVal;
- }
-
public String[] getReserveClasses() {
ArrayList<String> classList = new ArrayList<String>();
Properties properties = getClasses();