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/04/30 15:30:55 UTC
svn commit: r1477623 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/even...
Author: degenaro
Date: Tue Apr 30 13:30:55 2013
New Revision: 1477623
URL: http://svn.apache.org/r1477623
Log:
UIMA-2855 DUCC webserver (WS) not honoring "unified" --cancel_on_interrupt flag
Modified:
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-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/JobSpecificationProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationSpecificationProperties.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/SpecificationProperties.java
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=1477623&r1=1477622&r2=1477623&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 Tue Apr 30 13:30:55 2013
@@ -25,6 +25,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.cli.ReservationRequestProperties;
import org.apache.uima.ducc.transport.event.cli.ReservationSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
+import org.apache.uima.ducc.transport.event.cli.SpecificationProperties;
/**
* These are the constants supported by the 'not-using-a-props-file' form of registration in DuccServiceApi.
@@ -80,7 +81,7 @@ public interface IUiOptions
},
CancelOnInterrupt {
- public String pname() { return "cancel_on_interrupt"; }
+ public String pname() { return SpecificationProperties.key_cancel_on_interrupt; }
public String argname() { return null; }
public String description() { return "Cancel on interrupt (Ctrl-C). Implies "+WaitForCompletion.pname(); }
public String example() { return null; }
@@ -90,8 +91,9 @@ public interface IUiOptions
public boolean required() { return false; }
},
+ // Deprecated
CancelJobOnInterrupt {
- public String pname() { return "cancel_job_on_interrupt"; }
+ public String pname() { return JobSpecificationProperties.key_cancel_job_on_interrupt; }
public String argname() { return null; }
public String description() { return "same as "+CancelOnInterrupt.pname(); }
public String example() { return null; }
@@ -101,8 +103,9 @@ public interface IUiOptions
public boolean required() { return false; }
},
+ // Deprecated
CancelManagedReservationOnInterrupt {
- public String pname() { return "cancel_managed_reservation_on_interrupt"; }
+ public String pname() { return ReservationSpecificationProperties.key_cancel_managed_reservation_on_interrupt; }
public String argname() { return null; }
public String description() { return "same as "+CancelOnInterrupt.pname(); }
public String example() { return null; }
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=1477623&r1=1477622&r2=1477623&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 Tue Apr 30 13:30:55 2013
@@ -41,6 +41,7 @@ import org.apache.uima.ducc.transport.cm
import org.apache.uima.ducc.transport.event.cli.JobRequestProperties;
import org.apache.uima.ducc.transport.event.cli.JobSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.PropertiesHelper;
+import org.apache.uima.ducc.transport.event.cli.ReservationSpecificationProperties;
import org.apache.uima.ducc.transport.event.cli.ServiceRequestProperties;
import org.apache.uima.ducc.transport.event.common.DuccProcess;
import org.apache.uima.ducc.transport.event.common.DuccSchedulingInfo;
@@ -574,10 +575,13 @@ public class JobFactory {
job.setServiceEndpoint(ep);
}
// Cancel On Interrupt
- if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_job_on_interrupt)) {
+ if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_on_interrupt)) {
job.setCancelOnInterrupt();
}
- if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_managed_reservation_on_interrupt)) {
+ else if(jobRequestProperties.containsKey(JobSpecificationProperties.key_cancel_job_on_interrupt)) {
+ job.setCancelOnInterrupt();
+ }
+ else if(jobRequestProperties.containsKey(ReservationSpecificationProperties.key_cancel_managed_reservation_on_interrupt)) {
job.setCancelOnInterrupt();
}
//TODO be sure to clean-up fpath upon job completion!
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=1477623&r1=1477622&r2=1477623&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 Tue Apr 30 13:30:55 2013
@@ -83,8 +83,8 @@ public class JobSpecificationProperties
public static String key_classpath_order = "classpath_order";
+ // Deprecated
public static String key_cancel_job_on_interrupt = "cancel_job_on_interrupt";
- public static String key_cancel_managed_reservation_on_interrupt = "cancel_managed_reservation_on_interrupt";
public static String[] keys = {
JobRequestProperties.key_signature,
@@ -127,7 +127,6 @@ public class JobSpecificationProperties
key_wait_for_completion,
key_classpath_order,
key_cancel_job_on_interrupt,
- key_cancel_managed_reservation_on_interrupt,
};
public boolean isRecognized(String key) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationSpecificationProperties.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/ReservationSpecificationProperties.java?rev=1477623&r1=1477622&r2=1477623&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationSpecificationProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/ReservationSpecificationProperties.java Tue Apr 30 13:30:55 2013
@@ -26,6 +26,9 @@ import java.io.Serializable;
@SuppressWarnings("serial")
public class ReservationSpecificationProperties extends SpecificationProperties implements Serializable {
+ // Deprecated
+ public static String key_cancel_managed_reservation_on_interrupt = "cancel_managed_reservation_on_interrupt";
+
public static String key_number_of_instances = "number_of_instances";
public static String key_instance_memory_size = "instance_memory_size";
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/SpecificationProperties.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/SpecificationProperties.java?rev=1477623&r1=1477622&r2=1477623&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/SpecificationProperties.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/cli/SpecificationProperties.java Tue Apr 30 13:30:55 2013
@@ -28,6 +28,8 @@ import org.apache.uima.ducc.common.utils
@SuppressWarnings("serial")
public class SpecificationProperties extends DuccProperties implements Serializable {
+ public static String key_cancel_on_interrupt = "cancel_on_interrupt";
+
public static String key_submit_errors = "submit_errors";
public static String key_submit_warnings = "submit_warnings";