svn commit: r1707340 - in /uima/sandbox/uima-ducc/trunk: uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/ uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/ uima-ducc-transport/src/main/java/org/...

[de...@apache.org]

Author: degenaro
Date: Wed Oct  7 17:29:21 2015
New Revision: 1707340

URL: http://svn.apache.org/viewvc?rev=1707340&view=rev
Log:
UIMA-4638 DUCC Orchestrator (OR) should not use "dead reckoning" to determine if Reservation is for JDs

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java?rev=1707340&r1=1707339&r2=1707340&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/OrchestratorComponent.java Wed Oct  7 17:29:21 2015
@@ -277,8 +277,6 @@ implements Orchestrator {
 			StartType startType = getStartType(args);
 			logger.info(methodName, null, "##### "+startType+" #####");
 			boolean saveState = false;
-			DuccPropertiesResolver dpr = DuccPropertiesResolver.getInstance();
-			String jdHostClass = dpr.getCachedProperty(DuccPropertiesResolver.ducc_jd_host_class);
 			TrackSync ts = TrackSync.await(workMap, this.getClass(), methodName);
 			synchronized(workMap) {
 				ts.using();
@@ -310,7 +308,7 @@ implements Orchestrator {
 							saveState = true;
 							break;
 						case warm:
-							if(jdHostClass.equals(reservation.getSchedulingInfo().getSchedulingClass())) {
+							if(reservation.isJdReservation()) {
 								cancel(reservation);
 								saveState = true;
 							}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java?rev=1707340&r1=1707339&r2=1707340&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdScheduler.java Wed Oct  7 17:29:21 2015
@@ -306,6 +306,7 @@ public class JdScheduler {
 		reservationRequestProperties.setProperty(key, value);
 		//
 		DuccWorkReservation dwr = reservationFactory.create(common, reservationRequestProperties);
+		dwr.setJdReservation();
 		//
 		DuccWorkMap workMap = (DuccWorkMap) dwm;
 		WorkMapHelper.addDuccWork(workMap, dwr, this, location);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java?rev=1707340&r1=1707339&r2=1707340&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkReservation.java Wed Oct  7 17:29:21 2015
@@ -39,6 +39,7 @@ public class DuccWorkReservation extends
 	private IDuccReservationMap duccReservationMap = new DuccReservationMap();
 	private IRationale completionRationale = null;
 	private boolean waitForAssignment = false;
+	private boolean jdReservationFlag = false;
 	
 	// for JD Reservations only
 	private List<JdReservationBean> jdReservationBeanList = null;
@@ -68,6 +69,21 @@ public class DuccWorkReservation extends
 		setCompletionTypeObject(IDuccCompletionType.ReservationCompletionType.Undefined);
 	}
 
+	public void setJdReservation() {
+		jdReservationFlag = true;
+	}
+	
+	public boolean isJdReservation() {
+		boolean retVal = false;
+		try {
+			retVal = jdReservationFlag;
+		}
+		catch(Exception e) {
+			// must be legacy - no worries
+		}
+		return retVal;
+	}
+	
 	public void setJdReservationBeanList(List<JdReservationBean> value) {
 		jdReservationBeanList = value;
 	}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java?rev=1707340&r1=1707339&r2=1707340&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkReservation.java Wed Oct  7 17:29:21 2015
@@ -54,6 +54,7 @@ public interface IDuccWorkReservation ex
 	
 	public List<String> getUniqueNodes();
 	
+	public boolean isJdReservation();
 	public void setJdReservationBeanList(List<JdReservationBean> jdReservationBeanList);
 	public List<JdReservationBean> getJdReservationBeanList();
 }