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 2015/09/09 20:47:29 UTC

svn commit: r1702083 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event: common/ rm/

Author: degenaro
Date: Wed Sep  9 18:47:29 2015
New Revision: 1702083

URL: http://svn.apache.org/r1702083
Log:
UIMA-4569 DUCC OR+WS expunge "shares"

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkMap.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkMap.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
    uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/IResource.java

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.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/DuccReservation.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccReservation.java Wed Sep  9 18:47:29 2015
@@ -31,21 +31,21 @@ public class DuccReservation implements
 	private DuccId duccId = null;
 	private Node  node = null;
 	private NodeIdentity  nodeIdentity = null;
-	private int shares = 0;
+	private int bytes = 0;
 	private ITimeWindow timeWindow = null;
 	
-	public DuccReservation(DuccId duccId, Node node, int shares) {
+	public DuccReservation(DuccId duccId, Node node, int bytes) {
 		setDuccId(duccId);
 		setNode(node);
 		NodeIdentity nodeIdentity = node.getNodeIdentity();
 		setNodeIdentity(nodeIdentity);
-		setShares(shares);
+		setBytes(bytes);
 	}
 	
-	public DuccReservation(DuccId duccId, NodeIdentity nodeIdentity, int shares) {
+	public DuccReservation(DuccId duccId, NodeIdentity nodeIdentity, int bytes) {
 		setDuccId(duccId);
 		setNodeIdentity(nodeIdentity);
-		setShares(shares);
+		setBytes(bytes);
 	}
 	
 	
@@ -64,10 +64,10 @@ public class DuccReservation implements
 	}
 
 	
-	public int getShares() {
+	public int getBytes() {
 		int retVal = 0;
 		try {
-			retVal = shares;
+			retVal = bytes;
 		}
 		catch (Throwable t) {
 		}
@@ -75,8 +75,8 @@ public class DuccReservation implements
 	}
 
 	
-	public void setShares(int shares) {
-		this.shares = shares;
+	public void setBytes(int bytes) {
+		this.bytes = bytes;
 	}
 	
 	

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.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/DuccSchedulingInfo.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccSchedulingInfo.java Wed Sep  9 18:47:29 2015
@@ -35,16 +35,16 @@ public class DuccSchedulingInfo implemen
 	private static final long serialVersionUID = 1L;
 	private String schedulingClass = defaultSchedulingClass;
 	private String schedulingPriority = defaultSchedulingPriority;
-	private String shareMemorySize = defaultShareMemorySize;
-	private MemoryUnits shareMemoryUnits = defaultShareMemoryUnits;
+	private String memorySize = defaultMemorySize;
+	private MemoryUnits memoryUnits = defaultMemoryUnits;
 	private String instancesCount = defaultInstancesCount;
 	
 	@Deprecated
 	private String machinesCount = defaultMachinesCount;
 	
-	private String sharesMax = defaultSharesMax;
-	private String sharesMin = defaultSharesMin;
-	private String threadsPerShare = defaultThreadsPerShare;
+	private String processesMax = defaultProcessesMax;
+	private String processesMin = defaultProcessesMin;
+	private String threadsPerProcess = defaultThreadsPerProcess;
 	
 	private String workItemsTotal = defaultWorkItemsTotal;
 	private String workItemsCompleted = defaultWorkItemsCompleted;
@@ -117,83 +117,101 @@ public class DuccSchedulingInfo implemen
 	}
 	
 	
-	public String getShareMemorySize() {
-		return shareMemorySize;
+	public String getMemorySize() {
+		return memorySize;
 	}
+	
+	private static long KB = 1000;
+	private static long MB = 1000*KB;
+	private static long GB = 1000*MB;
 
+	public long getMemorySizeInBytes() {
+		long retVal = 0;
+		try {
+			long value = Long.parseLong(getMemorySize());
+			switch(memoryUnits) {
+			case GB:
+				retVal = value * GB;
+				break;
+			case MB:
+				retVal = value * MB;
+				break;	
+			case KB:
+				retVal = value * KB;
+				break;
+			}
+		}
+		catch(Exception e) {
+		}
+		return retVal;
+	}
 	
-	public void setShareMemorySize(String size) {
+	
+	public void setMemorySize(String size) {
 		if(size != null) {
-			this.shareMemorySize = size;
+			this.memorySize = size;
 		}
 	}
 
 	
-	public MemoryUnits getShareMemoryUnits() {
-		return shareMemoryUnits;
+	public MemoryUnits getMemoryUnits() {
+		return memoryUnits;
 	}
 
 	
-	public void setShareMemoryUnits(MemoryUnits units) {
+	public void setMemoryUnits(MemoryUnits units) {
 		if(units != null) {
-			this.shareMemoryUnits = units;
+			this.memoryUnits = units;
 		}
 	}
 	
+
+	public String getThreadsPerProcess() {
+		return threadsPerProcess;
+	}
+	
 	
-	public long getLongSharesMax() {
-		long retVal = -1;
-		try {
-			retVal = Long.parseLong(sharesMax);
-		}
-		catch(Throwable t) {
-		}
-		return retVal;
+	public long getLongProcessesMax() {
+		return Long.parseLong(processesMax);
 	}
 	
 	
-	public void setLongSharesMax(long shares) {
-		this.sharesMax = ""+shares;
+	public void setLongProcessesMax(long number) {
+		this.processesMax = ""+number;
 	}
 	
 	
-	public String getSharesMax() {
-		return sharesMax;
+	public String getProcessesMax() {
+		return processesMax;
 	}
 
 	
-	public void setSharesMax(String shares) {
-		if(shares != null) {
-			this.sharesMax = shares.trim();
+	public void setProcessesMax(String number) {
+		if(number != null) {
+			this.processesMax = number.trim();
 		}
 	}
 
 	
-	public String getSharesMin() {
-		return this.sharesMin;
+	public String getProcessesMin() {
+		return this.processesMin;
 	}
 
 	
-	public void setSharesMin(String shares) {
-		if(shares != null) {
-			this.sharesMin = shares;
+	public void setProcessesMin(String number) {
+		if(number != null) {
+			this.processesMin = number;
 		}
 	}
 	
-	
-	public String getThreadsPerShare() {
-		return threadsPerShare;
-	}
-	
-	
-	public int getIntThreadsPerShare() {
-		return Integer.parseInt(threadsPerShare);
+	public int getIntThreadsPerProcess() {
+		return Integer.parseInt(threadsPerProcess);
 	}
 
 	
-	public void setThreadsPerShare(String number) {
+	public void setThreadsPerProcess(String number) {
 		if(number != null) {
-			this.threadsPerShare = number;
+			this.threadsPerProcess = number;
 		}
 	}
 	
@@ -395,16 +413,12 @@ public class DuccSchedulingInfo implemen
 				+ ((schedulingPriority == null) ? 0 : schedulingPriority
 						.hashCode());
 		result = prime * result
-				+ ((shareMemorySize == null) ? 0 : shareMemorySize.hashCode());
+				+ ((memorySize == null) ? 0 : memorySize.hashCode());
 		result = prime
 				* result
-				+ ((shareMemoryUnits == null) ? 0 : shareMemoryUnits.hashCode());
+				+ ((memoryUnits == null) ? 0 : memoryUnits.hashCode());
 		result = prime * result
-				+ ((sharesMax == null) ? 0 : sharesMax.hashCode());
-		result = prime * result
-				+ ((sharesMin == null) ? 0 : sharesMin.hashCode());
-		result = prime * result
-				+ ((threadsPerShare == null) ? 0 : threadsPerShare.hashCode());
+				+ ((threadsPerProcess == null) ? 0 : threadsPerProcess.hashCode());
 		result = prime
 				* result
 				+ ((workItemsCompleted == null) ? 0 : workItemsCompleted
@@ -454,27 +468,17 @@ public class DuccSchedulingInfo implemen
 				return false;
 		} else if (!schedulingPriority.equals(other.schedulingPriority))
 			return false;
-		if (shareMemorySize == null) {
-			if (other.shareMemorySize != null)
-				return false;
-		} else if (!shareMemorySize.equals(other.shareMemorySize))
-			return false;
-		if (shareMemoryUnits != other.shareMemoryUnits)
-			return false;
-		if (sharesMax == null) {
-			if (other.sharesMax != null)
+		if (memorySize == null) {
+			if (other.memorySize != null)
 				return false;
-		} else if (!sharesMax.equals(other.sharesMax))
+		} else if (!memorySize.equals(other.memorySize))
 			return false;
-		if (sharesMin == null) {
-			if (other.sharesMin != null)
-				return false;
-		} else if (!sharesMin.equals(other.sharesMin))
+		if (memoryUnits != other.memoryUnits)
 			return false;
-		if (threadsPerShare == null) {
-			if (other.threadsPerShare != null)
+		if (threadsPerProcess == null) {
+			if (other.threadsPerProcess != null)
 				return false;
-		} else if (!threadsPerShare.equals(other.threadsPerShare))
+		} else if (!threadsPerProcess.equals(other.threadsPerProcess))
 			return false;
 		if (workItemsCompleted == null) {
 			if (other.workItemsCompleted != null)
@@ -510,49 +514,5 @@ public class DuccSchedulingInfo implemen
 			return false;
 		return true;
 	}
-	
-	// **********
-	
-//	
-//	public int hashCode() {
-//		final int prime = 31;
-//		int result = 1;
-//		result = prime * result + ((getSchedulingClass() == null) ? 0 : getSchedulingClass().hashCode());
-//		result = prime * result + ((getSchedulingPriority() == null) ? 0 : getSchedulingPriority().hashCode());
-//		result = prime * result + ((getSharesMax() == null) ? 0 : getSharesMax().hashCode());
-//		result = prime * result + ((getSharesMin() == null) ? 0 : getSharesMin().hashCode());
-//		result = prime * result + ((getShareMemorySize() == null) ? 0 : getShareMemorySize().hashCode());
-//		result = prime * result + ((getShareMemoryUnits() == null) ? 0 : getShareMemoryUnits().hashCode());
-//		result = prime * result + ((getThreadsPerShare() == null) ? 0 : getThreadsPerShare().hashCode());
-//		result = prime * result + super.hashCode();
-//		return result;
-//	}
-//	
-//	public boolean equals(Object obj) {
-//		boolean retVal = false;
-//		if(this == obj) {
-//			retVal = true;
-//		}
-//		else if(getClass() == obj.getClass()) {
-//			DuccSchedulingInfo that = (DuccSchedulingInfo)obj;
-//			if( 	Util.compare(this.getSchedulingClass(),that.getSchedulingClass()) 
-//				&&	Util.compare(this.getSchedulingPriority(),that.getSchedulingPriority()) 
-//				&&	Util.compare(this.getSharesMax(),that.getSharesMax()) 
-//				&&	Util.compare(this.getSharesMin(),that.getSharesMin()) 
-//			//	These don't change:
-//			//	&&	Util.compare(this.getShareMemorySize(),that.getShareMemorySize()) 
-//			//	&&	Util.compare(this.getShareMemoryUnits(),that.getShareMemoryUnits()) 
-//			//	&&	Util.compare(this.getInstancesCount(),that.getInstancesCount()) 
-//			//	&&	Util.compare(this.getThreadsPerShare(),that.getThreadsPerShare()) 
-////				&&	super.equals(obj)
-//				) 
-//			{
-//				retVal = true;
-//			}
-//		}
-//		return retVal;
-//	}
-	
-	
-	
+
 }

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.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/DuccWorkJob.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkJob.java Wed Sep  9 18:47:29 2015
@@ -310,8 +310,8 @@ public class DuccWorkJob extends ADuccWo
 		long capacity = 0;
 		try {
 			IDuccProcessMap processMap = getProcessMap();
-			int threads_per_share = Integer.parseInt(getSchedulingInfo().getThreadsPerShare());
-			capacity = processMap.getUsableProcessCount() * threads_per_share;
+			int threads_per_process = Integer.parseInt(getSchedulingInfo().getThreadsPerProcess());
+			capacity = processMap.getUsableProcessCount() * threads_per_process;
 		}
 		catch(Exception e) {
 		}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkMap.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/DuccWorkMap.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/DuccWorkMap.java Wed Sep  9 18:47:29 2015
@@ -187,6 +187,51 @@ public class DuccWorkMap implements IDuc
 		return retVal;
 	}
 	
+	//
+	
+	public long getMemoryInuseJobs() {
+		long size = 0;
+		Set<DuccId> keys = getJobKeySet();
+		for(DuccId key : keys) {
+			IDuccWorkJob job = (IDuccWorkJob)concurrentWorkMap.get(key);
+			long bytesPerProcess = job.getSchedulingInfo().getMemorySizeInBytes();
+			long numberOfProcesses = job.getAliveProcessCount();
+			size += bytesPerProcess * numberOfProcesses;
+		}
+		return size;
+	}
+	
+	public long getMemoryInuseServices() {
+		long size = 0;
+		Set<DuccId> keys = getServiceKeySet();
+		for(DuccId key : keys) {
+			IDuccWorkService service = (IDuccWorkService)concurrentWorkMap.get(key);
+			long bytesPerProcess = service.getSchedulingInfo().getMemorySizeInBytes();
+			long numberOfProcesses = 1;
+			size += bytesPerProcess * numberOfProcesses;
+		}
+		return size;
+	}
+	
+	public long getMemoryInuseReservations() {
+		long size = 0;
+		Set<DuccId> keys = getReservationKeySet();
+		for(DuccId key : keys) {
+			IDuccWorkReservation reservation = (IDuccWorkReservation)concurrentWorkMap.get(key);
+			long bytesPerReservation = reservation.getSchedulingInfo().getMemorySizeInBytes();
+			long numberOfReservations = 1;
+			size += bytesPerReservation * numberOfReservations;
+		}
+		return size;
+	}
+	
+	public long getMemoryInuse() {
+		long retVal = getMemoryInuseJobs()+getMemoryInuseServices()+getMemoryInuseReservations();
+		return retVal;
+	}
+	
+	//
+	
 	public ConcurrentHashMap<DuccId,IDuccWork> getMap() {
 		return concurrentWorkMap;
 	}

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.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/IDuccReservation.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccReservation.java Wed Sep  9 18:47:29 2015
@@ -36,8 +36,8 @@ public interface IDuccReservation extend
 	public NodeIdentity getNodeIdentity();
 	public void setNodeIdentity(NodeIdentity nodeIdentity);
 	
-	public int getShares();
-	public void setShares(int shares);
+	public int getBytes();
+	public void setBytes(int bytes);
 	
 	public ITimeWindow getTimeWindow();
 	public void setTimeWindow(ITimeWindow timeWindow);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.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/IDuccSchedulingInfo.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccSchedulingInfo.java Wed Sep  9 18:47:29 2015
@@ -30,19 +30,19 @@ public interface IDuccSchedulingInfo ext
 	
 	public static final String defaultSchedulingClass = "normal";
 	public static final String defaultSchedulingPriority = "0";
-	public static final String defaultShareMemorySize = "13";
-	public static final MemoryUnits defaultShareMemoryUnits = MemoryUnits.GB;
+	public static final String defaultMemorySize = "13";
+	public static final MemoryUnits defaultMemoryUnits = MemoryUnits.GB;
 	public static final String defaultInstancesCount = "1";
 	
 	@Deprecated
 	public static final String defaultMachinesCount = "0";
 	
-	public static final String defaultSharesMax = "0";
-	public static final String defaultSharesMin = "0";
-	public static final String defaultThreadsPerShare = "1";
+	public static final String defaultProcessesMax = "0";
+	public static final String defaultProcessesMin = "0";
+	public static final String defaultThreadsPerProcess = "1";
 	
-	public static final String minThreadsPerShare = "1";
-	public static final String maxThreadsPerShare = "100";
+	public static final String minThreadsPerProcess = "1";
+	public static final String maxThreadsPerProcess = "100";
 	
 	public static final String defaultWorkItemsTotal = "unknown";
 	public static final String defaultWorkItemsCompleted = "0";
@@ -62,11 +62,13 @@ public interface IDuccSchedulingInfo ext
 	public String getSchedulingPriority();
 	public void setSchedulingPriority(String schedulingPriority);
 	
-	public String getShareMemorySize();
-	public void setShareMemorySize(String size);
+	public String getMemorySize();
+	public void setMemorySize(String size);
 	
-	public MemoryUnits getShareMemoryUnits();
-	public void setShareMemoryUnits(MemoryUnits units);
+	public long getMemorySizeInBytes();
+	
+	public MemoryUnits getMemoryUnits();
+	public void setMemoryUnits(MemoryUnits units);
 	
 	// reservations
 	
@@ -80,19 +82,19 @@ public interface IDuccSchedulingInfo ext
 	
 	// processes
 	
-	public long getLongSharesMax();
-	public void setLongSharesMax(long shares);
+	public long getLongProcessesMax();
+	public void setLongProcessesMax(long number);
 	
-	public String getSharesMax();
-	public void setSharesMax(String shares);
+	public String getProcessesMax();
+	public void setProcessesMax(String number);
 	
-	public String getSharesMin();
-	public void setSharesMin(String shares);
+	public String getProcessesMin();
+	public void setProcessesMin(String number); 
 	
-	public String getThreadsPerShare();
-	public void setThreadsPerShare(String number);
+	public String getThreadsPerProcess();
+	public void setThreadsPerProcess(String number);
 	
-	public int getIntThreadsPerShare();
+	public int getIntThreadsPerProcess();
 	
 	public String getWorkItemsTotal();
 	public void setWorkItemsTotal(String number);

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkMap.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/IDuccWorkMap.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkMap.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IDuccWorkMap.java Wed Sep  9 18:47:29 2015
@@ -52,4 +52,9 @@ public interface IDuccWorkMap extends Se
 	
 	public void addDuccWork(IDuccWork duccWork);
 	public void removeDuccWork(DuccId duccId);
+	
+	public long getMemoryInuseJobs();
+	public long getMemoryInuseServices();
+	public long getMemoryInuseReservations();
+	public long getMemoryInuse();
 }

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.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/JdReservationBean.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java Wed Sep  9 18:47:29 2015
@@ -36,7 +36,7 @@ public class JdReservationBean implement
 	private DuccId jdReservationDuccId = null;
 	private NodeIdentity nodeIdentity;
 	private ReservationState reservationState = null;
-	private Long shareSize = new Long(30*GB);
+	private Long reservationSize = new Long(30*GB);
 	private Long sliceSize = new Long(300*MB);
 	
 	private ConcurrentHashMap<DuccId, Long> map = new ConcurrentHashMap<DuccId, Long>();
@@ -73,12 +73,12 @@ public class JdReservationBean implement
 		return reservationState;
 	}
 	
-	public void setShareSize(Long value) {
-		shareSize = value;
+	public void setReservationSize(Long value) {
+		reservationSize = value;
 	}
 	
-	public Long getShareSize() {
-		return shareSize;
+	public Long getReservationSize() {
+		return reservationSize;
 	}
 	
 	public void setSliceSize(Long value) {

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/IResource.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/IResource.java?rev=1702083&r1=1702082&r2=1702083&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/IResource.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/rm/IResource.java Wed Sep  9 18:47:29 2015
@@ -51,9 +51,4 @@ public interface IResource extends Seria
      * If true, this share has been purged because its node went AWOL.
      */
     boolean isPurged();
-
-    /**
-     * Returns the number of quantum shares this resource occupies.
-     */
-    int countShares();
 }