svn commit: r1700858 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java

[de...@apache.org]

Author: degenaro
Date: Wed Sep  2 17:58:58 2015
New Revision: 1700858

URL: http://svn.apache.org/r1700858
Log:
UIMA-2869DUCC Orchestrator (OR) must reject [or queue] job submissions when JD allocation is full, so as to not over-commit c-group

- JD Scheduler remove bogus code that calculates "number of shares" for Reservation

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.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/JdReservation.java?rev=1700858&r1=1700857&r2=1700858&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.java Wed Sep  2 17:58:58 2015
@@ -18,14 +18,12 @@
 */
 package org.apache.uima.ducc.orchestrator.jd.scheduler;
 
-import java.text.DecimalFormat;
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.apache.uima.ducc.common.NodeIdentity;
 import org.apache.uima.ducc.common.utils.DuccLogger;
 import org.apache.uima.ducc.common.utils.id.DuccId;
 import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
-import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
 import org.apache.uima.ducc.transport.event.common.IDuccWorkReservation;
 import org.apache.uima.ducc.transport.event.common.JdReservationBean;
 
@@ -39,49 +37,6 @@ public class JdReservation extends JdRes
 		initialize(dwr, shareSizeMB, sliceSizeMB);
 	}
 	
-	private String getProcessMemorySize(DuccId id, String type, String size, MemoryUnits units) {
-		String methodName = "getProcessMemorySize";
-		String retVal = "?";
-		double multiplier = 1;
-		switch(units) {
-		case KB:
-			multiplier = Math.pow(10, -6);
-			break;
-		case MB:
-			multiplier = Math.pow(10, -3);
-			break;
-		case GB:
-			multiplier = Math.pow(10, 0);
-			break;
-		case TB:
-			multiplier = Math.pow(10, 3);
-			break;
-		}
-		try {
-			double dSize = Double.parseDouble(size) * multiplier;
-			DecimalFormat formatter = new DecimalFormat("###0");
-			retVal = formatter.format(dSize);
-		}
-		catch(Exception e) {
-			logger.trace(methodName, id, "type"+type+" "+"size"+size, e);
-		}
-		return retVal;	
-	}
-	
-	private Long calculateShares(IDuccWorkReservation dwr) {
-		Long retVal = new Long(1);
-		try {
-			String type="Reservation";
-			String size = dwr.getSchedulingInfo().getShareMemorySize();
-			MemoryUnits units = dwr.getSchedulingInfo().getShareMemoryUnits();
-			String ms = getProcessMemorySize(dwr.getDuccId(),type,size,units);
-			retVal = Long.parseLong(ms);
-		}
-		catch(Exception e) {
-		}
-		return retVal;
-	}
-	
 	private void initialize(IDuccWorkReservation dwr, Long shareSize, Long sliceSize) {
 		if(dwr != null) {
 			DuccId jdReservationId = (DuccId) dwr.getDuccId();
@@ -94,7 +49,6 @@ public class JdReservation extends JdRes
 			if(sliceSize != null) {
 				setSliceSize(sliceSize);
 			}
-			setShareCount(calculateShares(dwr));
 		}
 	}
 	
@@ -123,10 +77,9 @@ public class JdReservation extends JdRes
 	}
 	
 	public Long getSlicesTotal() {
-		Long shareCount = getShareCount();
 		Long shareSize = getShareSize();
 		Long sliceSize = getSliceSize();
-		Long retVal = (shareSize * shareCount) / sliceSize;
+		Long retVal = shareSize / sliceSize;
 		return retVal;
 	}