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/01 14:05:05 UTC
svn commit: r1700512 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/
uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/
uima-ducc-web/src/main/java/org...
Author: degenaro
Date: Tue Sep 1 12:05:04 2015
New Revision: 1700512
URL: http://svn.apache.org/r1700512
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 refactor in anticipation of DB
Added:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/IJdReservation.java
- copied, changed from r1700232, uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IJdReservation.java
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java (with props)
Removed:
uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IJdReservation.java
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/JdReservation.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
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
Copied: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/IJdReservation.java (from r1700232, uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IJdReservation.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/IJdReservation.java?p2=uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/IJdReservation.java&p1=uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IJdReservation.java&r1=1700232&r2=1700512&rev=1700512&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/IJdReservation.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/jd/scheduler/IJdReservation.java Tue Sep 1 12:05:04 2015
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.uima.ducc.transport.event.common;
+package org.apache.uima.ducc.orchestrator.jd.scheduler;
import java.io.Serializable;
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=1700512&r1=1700511&r2=1700512&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 Tue Sep 1 12:05:04 2015
@@ -27,23 +27,14 @@ import org.apache.uima.ducc.common.utils
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.IJdReservation;
+import org.apache.uima.ducc.transport.event.common.JdReservationBean;
-public class JdReservation implements IJdReservation {
+public class JdReservation extends JdReservationBean implements IJdReservation {
private static final long serialVersionUID = 1L;
private static DuccLogger logger = new DuccLogger(JdReservation.class);
- private DuccId jdReservationDuccId = null;
- private NodeIdentity nodeIdentity;
- private ReservationState reservationState = null;
- private Long shareCount = new Long(1);
- private Long shareSize = new Long(30*JdHelper.GB);
- private Long sliceSize = new Long(300*JdHelper.MB);
-
- private ConcurrentHashMap<DuccId, Long> map = new ConcurrentHashMap<DuccId, Long>();
-
public JdReservation(IDuccWorkReservation dwr, Long shareSizeMB, Long sliceSizeMB) {
initialize(dwr, shareSizeMB, sliceSizeMB);
}
@@ -107,35 +98,18 @@ public class JdReservation implements IJ
}
}
- private void setJdReservationId(DuccId value) {
- jdReservationDuccId = value;
- }
-
- public DuccId getDuccId() {
- return jdReservationDuccId;
- }
-
- private void setNodeIdentity(NodeIdentity value) {
- nodeIdentity = value;
- }
-
public String getHost() {
String retVal = null;
+ NodeIdentity nodeIdentity= getNodeIdentity();
if(nodeIdentity != null) {
retVal = nodeIdentity.getName();
}
return retVal;
}
- private void setReservationState(ReservationState value) {
- reservationState = value;
- }
-
- public ReservationState getReservationState() {
- return reservationState;
- }
public boolean isUp() {
boolean retVal = false;
+ ReservationState reservationState = getReservationState();
if(reservationState != null) {
switch(reservationState) {
case Assigned:
@@ -148,30 +122,6 @@ public class JdReservation implements IJ
return retVal;
}
- private void setShareCount(Long value) {
- shareCount = value;
- }
-
- private Long getShareCount() {
- return shareCount;
- }
-
- private void setShareSize(Long value) {
- shareSize = value;
- }
-
- private Long getShareSize() {
- return shareSize;
- }
-
- private void setSliceSize(Long value) {
- sliceSize = value;
- }
-
- private Long getSliceSize() {
- return sliceSize;
- }
-
public Long getSlicesTotal() {
Long shareCount = getShareCount();
Long shareSize = getShareSize();
@@ -181,6 +131,7 @@ public class JdReservation implements IJ
}
public Long getSlicesInuse() {
+ ConcurrentHashMap<DuccId, Long> map = getMap();
long retVal = new Long(map.size());
return retVal;
}
@@ -208,12 +159,13 @@ public class JdReservation implements IJ
protected NodeIdentity allocate(DuccId jdId, DuccId jobId, Long size) {
String location = "allocate";
NodeIdentity retVal = null;
+ ConcurrentHashMap<DuccId, Long> map = getMap();
if(jdId != null) {
synchronized(map) {
if(!map.containsKey(jdId)) {
if(!isFull()) {
map.put(jdId, size);
- retVal = nodeIdentity;
+ retVal = getNodeIdentity();;
}
}
}
@@ -227,11 +179,12 @@ public class JdReservation implements IJ
protected NodeIdentity deallocate(DuccId jdId, DuccId jobId) {
String location = "deallocate";
NodeIdentity retVal = null;
+ ConcurrentHashMap<DuccId, Long> map = getMap();
if(jdId != null) {
synchronized(map) {
if(map.containsKey(jdId)) {
map.remove(jdId);
- retVal = nodeIdentity;
+ retVal = getNodeIdentity();
}
}
if(retVal != null) {
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=1700512&r1=1700511&r2=1700512&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 Tue Sep 1 12:05:04 2015
@@ -44,7 +44,7 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkMap;
import org.apache.uima.ducc.transport.event.common.IDuccWorkReservation;
-import org.apache.uima.ducc.transport.event.common.IJdReservation;
+import org.apache.uima.ducc.transport.event.common.JdReservationBean;
import org.apache.uima.ducc.transport.event.common.Rationale;
public class JdScheduler {
@@ -89,10 +89,10 @@ public class JdScheduler {
IDuccWork dw = dwm.findDuccWork(duccId);
if(dw instanceof IDuccWorkReservation) {
IDuccWorkReservation dwr = (IDuccWorkReservation) dw;
- List<IJdReservation> jdReservationList = getJdReservationList(jdReservationDuccId);
- dwr.setJdReservationList(jdReservationList);
- if(jdReservationList != null) {
- logger.debug(location, duccId, "size: "+jdReservationList.size());
+ List<JdReservationBean> jdReservationBeanList = getJdReservationBeanList(jdReservationDuccId);
+ dwr.setJdReservationBeanList(jdReservationBeanList);
+ if(jdReservationBeanList != null) {
+ logger.debug(location, duccId, "size: "+jdReservationBeanList.size());
}
else {
logger.debug(location, duccId, "size: "+null);
@@ -115,9 +115,9 @@ public class JdScheduler {
IDuccWork dw = entry.getValue();
if(dw instanceof IDuccWorkReservation) {
IDuccWorkReservation dwr = (IDuccWorkReservation) dw;
- List<IJdReservation> jdReservationList = dwr.getJdReservationList();
- if(jdReservationList != null) {
- setJdReservationList(jdReservationList);
+ List<JdReservationBean> jdReservationBeanList = dwr.getJdReservationBeanList();
+ if(jdReservationBeanList != null) {
+ setJdReservationBeanList(jdReservationBeanList);
}
}
}
@@ -359,9 +359,9 @@ public class JdScheduler {
logger.trace(location, jobid, "actual: "+slicesReserveActual+" "+"desired: "+slicesReserveDesired);
}
- private void setJdReservationList(List<IJdReservation> jdReservationList) {
- if(jdReservationList != null) {
- for(IJdReservation entry : jdReservationList) {
+ private void setJdReservationBeanList(List<JdReservationBean> jdReservationBeanList) {
+ if(jdReservationBeanList != null) {
+ for(JdReservationBean entry : jdReservationBeanList) {
JdReservation jdReservation = (JdReservation) entry;
DuccId jdReservationDuccId = jdReservation.getDuccId();
map.put(jdReservationDuccId, jdReservation);
@@ -369,18 +369,18 @@ public class JdScheduler {
}
}
- public List<IJdReservation> getJdReservationList(DuccId jdReservationDuccId) {
- String location = "getJdReservationList";
- List<IJdReservation> jdReservationList = new ArrayList<IJdReservation>();
+ public List<JdReservationBean> getJdReservationBeanList(DuccId jdReservationDuccId) {
+ String location = "getJdReservationBeanList";
+ List<JdReservationBean> jdReservationBeanList = new ArrayList<JdReservationBean>();
for(Entry<DuccId, JdReservation> entry : map.entrySet()) {
JdReservation jdReservation = entry.getValue();
if(jdReservationDuccId.equals(jdReservation.getDuccId())) {
- jdReservationList.add(jdReservation);
+ jdReservationBeanList.add(jdReservation);
DuccId duccId = (DuccId) jdReservationDuccId;
- logger.trace(location, duccId, jdReservationList.size());
+ logger.trace(location, duccId, jdReservationBeanList.size());
}
}
- return jdReservationList;
+ return jdReservationBeanList;
}
public int countSharesTotal() {
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=1700512&r1=1700511&r2=1700512&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 Tue Sep 1 12:05:04 2015
@@ -41,7 +41,7 @@ public class DuccWorkReservation extends
private boolean waitForAssignment = false;
// for JD Reservations only
- private List<IJdReservation> jdReservationList = null;
+ private List<JdReservationBean> jdReservationBeanList = null;
public DuccWorkReservation() {
init(null);
@@ -58,12 +58,12 @@ public class DuccWorkReservation extends
setCompletionTypeObject(IDuccCompletionType.ReservationCompletionType.Undefined);
}
- public void setJdReservationList(List<IJdReservation> value) {
- jdReservationList = value;
+ public void setJdReservationBeanList(List<JdReservationBean> value) {
+ jdReservationBeanList = value;
}
- public List<IJdReservation> getJdReservationList() {
- return jdReservationList;
+ public List<JdReservationBean> getJdReservationBeanList() {
+ return jdReservationBeanList;
}
public IDuccReservationMap getReservationMap() {
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=1700512&r1=1700511&r2=1700512&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 Tue Sep 1 12:05:04 2015
@@ -54,6 +54,6 @@ public interface IDuccWorkReservation ex
public List<String> getUniqueNodes();
- public void setJdReservationList(List<IJdReservation> jdReservationList);
- public List<IJdReservation> getJdReservationList();
+ public void setJdReservationBeanList(List<JdReservationBean> jdReservationBeanList);
+ public List<JdReservationBean> getJdReservationBeanList();
}
Added: 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=1700512&view=auto
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java (added)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java Tue Sep 1 12:05:04 2015
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+*/
+package org.apache.uima.ducc.transport.event.common;
+
+import java.io.Serializable;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.uima.ducc.common.NodeIdentity;
+import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
+
+public class JdReservationBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+ public static long KB = 1024;
+ public static long MB = 1024*KB;
+ public static long GB = 1024*MB;
+ public static long TB = 1024*GB;
+
+ private DuccId jdReservationDuccId = null;
+ private NodeIdentity nodeIdentity;
+ private ReservationState reservationState = null;
+ private Long shareCount = new Long(1);
+ private Long shareSize = new Long(30*GB);
+ private Long sliceSize = new Long(300*MB);
+
+ private ConcurrentHashMap<DuccId, Long> map = new ConcurrentHashMap<DuccId, Long>();
+
+ public void setMap(ConcurrentHashMap<DuccId, Long> value) {
+ map = value;
+ }
+
+ public ConcurrentHashMap<DuccId, Long> getMap() {
+ return map;
+ }
+
+ public void setJdReservationId(DuccId value) {
+ jdReservationDuccId = value;
+ }
+
+ public DuccId getDuccId() {
+ return jdReservationDuccId;
+ }
+
+ public void setNodeIdentity(NodeIdentity value) {
+ nodeIdentity = value;
+ }
+
+ public NodeIdentity getNodeIdentity() {
+ return nodeIdentity;
+ }
+
+ public void setReservationState(ReservationState value) {
+ reservationState = value;
+ }
+
+ public ReservationState getReservationState() {
+ return reservationState;
+ }
+
+ public void setShareCount(Long value) {
+ shareCount = value;
+ }
+
+ public Long getShareCount() {
+ return shareCount;
+ }
+
+ public void setShareSize(Long value) {
+ shareSize = value;
+ }
+
+ public Long getShareSize() {
+ return shareSize;
+ }
+
+ public void setSliceSize(Long value) {
+ sliceSize = value;
+ }
+
+ public Long getSliceSize() {
+ return sliceSize;
+ }
+
+}
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: uima/sandbox/uima-ducc/trunk/uima-ducc-transport/src/main/java/org/apache/uima/ducc/transport/event/common/JdReservationBean.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java?rev=1700512&r1=1700511&r2=1700512&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerClassic.java Tue Sep 1 12:05:04 2015
@@ -52,6 +52,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.orchestrator.jd.scheduler.JdReservation;
import org.apache.uima.ducc.transport.Constants;
import org.apache.uima.ducc.transport.event.DbComponentPropertiesHelper;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
@@ -63,8 +64,8 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
-import org.apache.uima.ducc.transport.event.common.IJdReservation;
import org.apache.uima.ducc.transport.event.common.IRationale;
+import org.apache.uima.ducc.transport.event.common.JdReservationBean;
import org.apache.uima.ducc.ws.DuccDaemonsData;
import org.apache.uima.ducc.ws.DuccData;
import org.apache.uima.ducc.ws.DuccMachinesData;
@@ -583,11 +584,12 @@ public class DuccHandlerClassic extends
}
break;
case Assigned:
- List<IJdReservation> list = reservation.getJdReservationList();
+ List<JdReservationBean> list = reservation.getJdReservationBeanList();
long inuse = 0;
long total = 0;
if(list != null) {
- for(IJdReservation jdReservation : list) {
+ for(JdReservationBean jdReservationBean : list) {
+ JdReservation jdReservation = (JdReservation) jdReservationBean;
inuse += jdReservation.getSlicesInuse();
total += jdReservation.getSlicesTotal();
}
@@ -596,7 +598,7 @@ public class DuccHandlerClassic extends
sb.append("inuse: "+inuse);
sb.append("</span>");
sb.append(" ");
- title = "title=\"the number of job driver allocations limit for this reservation\"";
+ title = "title=\"the number of job driver allocations maximum capacity for this reservation\"";
sb.append("<span "+title+">");
sb.append("limit: "+total);
sb.append("</span>");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java?rev=1700512&r1=1700511&r2=1700512&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerJsonFormat.java Tue Sep 1 12:05:04 2015
@@ -55,6 +55,7 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.DuccSchedulerClasses;
import org.apache.uima.ducc.common.utils.TimeStamp;
import org.apache.uima.ducc.common.utils.id.DuccId;
+import org.apache.uima.ducc.orchestrator.jd.scheduler.JdReservation;
import org.apache.uima.ducc.transport.Constants;
import org.apache.uima.ducc.transport.event.DbComponentPropertiesHelper;
import org.apache.uima.ducc.transport.event.common.DuccWorkJob;
@@ -67,8 +68,8 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccUnits.MemoryUnits;
import org.apache.uima.ducc.transport.event.common.IDuccWork;
import org.apache.uima.ducc.transport.event.common.IDuccWorkJob;
-import org.apache.uima.ducc.transport.event.common.IJdReservation;
import org.apache.uima.ducc.transport.event.common.IRationale;
+import org.apache.uima.ducc.transport.event.common.JdReservationBean;
import org.apache.uima.ducc.ws.DuccDaemonsData;
import org.apache.uima.ducc.ws.DuccData;
import org.apache.uima.ducc.ws.DuccMachinesData;
@@ -681,11 +682,12 @@ public class DuccHandlerJsonFormat exten
}
break;
case Assigned:
- List<IJdReservation> list = reservation.getJdReservationList();
+ List<JdReservationBean> list = reservation.getJdReservationBeanList();
long inuse = 0;
long total = 0;
if(list != null) {
- for(IJdReservation jdReservation : list) {
+ for(JdReservationBean jdReservationBean : list) {
+ JdReservation jdReservation = (JdReservation) jdReservationBean;
inuse += jdReservation.getSlicesInuse();
total += jdReservation.getSlicesTotal();
}
@@ -694,7 +696,7 @@ public class DuccHandlerJsonFormat exten
sb.append("inuse: "+inuse);
sb.append("</span>");
sb.append(" ");
- title = "title=\"the number of job driver allocations limit for this reservation\"";
+ title = "title=\"the number of job driver allocations maximum capacity for this reservation\"";
sb.append("<span "+title+">");
sb.append("limit: "+total);
sb.append("</span>");