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/05/07 14:54:50 UTC
svn commit: r1678184 -
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/
Author: degenaro
Date: Thu May 7 12:54:50 2015
New Revision: 1678184
URL: http://svn.apache.org/r1678184
Log:
UIMA-4373 DUCC Enhance monitor to report resource allocation status for reservations
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.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
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java?rev=1678184&r1=1678183&r2=1678184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccAbstractHandler.java Thu May 7 12:54:50 2015
@@ -45,7 +45,6 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccProcessMap;
import org.apache.uima.ducc.transport.event.common.IDuccSchedulingInfo;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
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;
@@ -57,6 +56,7 @@ import org.apache.uima.ducc.ws.JobProces
import org.apache.uima.ducc.ws.registry.IServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistry;
import org.apache.uima.ducc.ws.server.DuccCookies.DateStyle;
+import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.apache.uima.ducc.ws.utils.FormatHelper;
import org.apache.uima.ducc.ws.utils.FormatHelper.Precision;
import org.apache.uima.ducc.ws.utils.HandlersHelper;
@@ -947,14 +947,14 @@ public abstract class DuccAbstractHandle
return retVal;
}
- protected String getMonitor(DuccId duccId, DuccType type) {
- return getMonitor(duccId, type, false);
+ protected String getMonitor(DuccId duccId, MonitorType monitorType) {
+ return getMonitor(duccId, monitorType, false);
}
- protected String getMonitor(DuccId duccId, DuccType type, boolean multi) {
+ protected String getMonitor(DuccId duccId, MonitorType monitorType, boolean multi) {
StringBuffer sb = new StringBuffer();
DuccWebMonitor duccWebMonitor = DuccWebMonitor.getInstance();
- Long expiry = duccWebMonitor.getExpiry(type, duccId);
+ Long expiry = duccWebMonitor.getExpiry(monitorType, duccId);
if(!duccWebMonitor.isAutoCancelEnabled()) {
if(expiry != null) {
String text = "webserver not primary";
@@ -1001,7 +1001,7 @@ public abstract class DuccAbstractHandle
}
sb.append("</span>");
}
- else if(duccWebMonitor.isCanceled(DuccType.Job, duccId)) {
+ else if(duccWebMonitor.isCanceled(MonitorType.Job, duccId)) {
sb.append("<span class=\"health_red\" >");
sb.append("CancelPending...");
sb.append("</span>");
@@ -1009,7 +1009,7 @@ public abstract class DuccAbstractHandle
return sb.toString();
}
- protected StringBuffer getReason(IDuccWorkJob job, DuccType type) {
+ protected StringBuffer getReason(IDuccWorkJob job, MonitorType monitorType) {
StringBuffer sb = new StringBuffer();
try {
if(job != null) {
@@ -1026,7 +1026,7 @@ public abstract class DuccAbstractHandle
}
break;
default:
- String monitor = getMonitor(duccId, type);
+ String monitor = getMonitor(duccId, monitorType);
if(monitor.length() > 0) {
sb.append(monitor);
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java?rev=1678184&r1=1678183&r2=1678184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandler.java Thu May 7 12:54:50 2015
@@ -104,6 +104,7 @@ import org.apache.uima.ducc.ws.registry.
import org.apache.uima.ducc.ws.registry.ServicesRegistry;
import org.apache.uima.ducc.ws.registry.ServicesRegistryMapPayload;
import org.apache.uima.ducc.ws.registry.sort.ServicesSortCache;
+import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.apache.uima.ducc.ws.sort.JobDetailsProcesses;
import org.apache.uima.ducc.ws.utils.FormatHelper;
import org.apache.uima.ducc.ws.utils.FormatHelper.Precision;
@@ -1364,7 +1365,7 @@ public class DuccHandler extends DuccAbs
if(job.isCompleted()) {
sb.append("<th title=\"The reason for the final state of this job, normally EndOfJob\">");
sb.append("Reason: ");
- String reason = getReason(job, DuccType.Job).toString();
+ String reason = getReason(job, MonitorType.Job).toString();
sb.append(reason);
thSep(sb);
}
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=1678184&r1=1678183&r2=1678184&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 Thu May 7 12:54:50 2015
@@ -60,7 +60,6 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccProcess;
import org.apache.uima.ducc.transport.event.common.IDuccReservation;
import org.apache.uima.ducc.transport.event.common.IDuccReservationMap;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
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;
@@ -80,6 +79,7 @@ import org.apache.uima.ducc.ws.registry.
import org.apache.uima.ducc.ws.registry.sort.ServicesHelper;
import org.apache.uima.ducc.ws.registry.sort.ServicesSortCache;
import org.apache.uima.ducc.ws.server.DuccCookies.DisplayStyle;
+import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.apache.uima.ducc.ws.types.NodeId;
import org.apache.uima.ducc.ws.types.UserId;
import org.apache.uima.ducc.ws.utils.FormatHelper.Precision;
@@ -224,7 +224,7 @@ public class DuccHandlerClassic extends
}
sb.append("</td>");
// Reason
- String reason = getReason(job, DuccType.Job).toString();
+ String reason = getReason(job, MonitorType.Job).toString();
sb.append("<td valign=\"bottom\" align=\"right\">");
sb.append(reason);
sb.append("</td>");
@@ -637,7 +637,7 @@ public class DuccHandlerClassic extends
}
else if(duccwork instanceof DuccWorkJob) {
DuccWorkJob job = (DuccWorkJob) duccwork;
- String reason = getReason(job, DuccType.Reservation).toString();
+ String reason = getReason(job, MonitorType.ManagedReservation).toString();
sb.append("<td>");
sb.append(reason);
sb.append("</td>");
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=1678184&r1=1678183&r2=1678184&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 Thu May 7 12:54:50 2015
@@ -64,7 +64,6 @@ import org.apache.uima.ducc.transport.ev
import org.apache.uima.ducc.transport.event.common.IDuccReservation;
import org.apache.uima.ducc.transport.event.common.IDuccReservationMap;
import org.apache.uima.ducc.transport.event.common.IDuccState.ReservationState;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
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;
@@ -85,6 +84,7 @@ import org.apache.uima.ducc.ws.registry.
import org.apache.uima.ducc.ws.registry.sort.ServicesHelper;
import org.apache.uima.ducc.ws.registry.sort.ServicesSortCache;
import org.apache.uima.ducc.ws.server.DuccCookies.DisplayStyle;
+import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.apache.uima.ducc.ws.types.NodeId;
import org.apache.uima.ducc.ws.types.UserId;
import org.apache.uima.ducc.ws.utils.FormatHelper.Precision;
@@ -251,7 +251,7 @@ public class DuccHandlerJsonFormat exten
sb.append("</span>");
row.add(new JsonPrimitive(sb.toString()));
// Reason
- sb = getReason(job,DuccType.Job);
+ sb = getReason(job,MonitorType.Job);
row.add(new JsonPrimitive(sb.toString()));
// Services
sb = new StringBuffer();
@@ -734,7 +734,7 @@ public class DuccHandlerJsonFormat exten
else if(duccwork instanceof DuccWorkJob) {
// Reason
DuccWorkJob job = (DuccWorkJob) duccwork;
- sb = getReason(job,DuccType.Reservation);
+ sb = getReason(job,MonitorType.ManagedReservation);
}
row.add(new JsonPrimitive(sb.toString()));
// Allocation
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java?rev=1678184&r1=1678183&r2=1678184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerProxy.java Thu May 7 12:54:50 2015
@@ -29,8 +29,7 @@ import org.apache.uima.ducc.common.json.
import org.apache.uima.ducc.common.utils.DuccLogger;
import org.apache.uima.ducc.common.utils.DuccLoggerComponents;
import org.apache.uima.ducc.common.utils.id.DuccId;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
-import org.apache.uima.ducc.ws.server.IWebMonitor.ReservationType;
+import org.apache.uima.ducc.ws.server.IWebMonitor.MonitorType;
import org.eclipse.jetty.server.Request;
import com.google.gson.Gson;
@@ -100,7 +99,7 @@ public class DuccHandlerProxy extends Du
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
}
else {
- MonitorInfo monitorInfo = duccWebMonitor.renew(DuccType.Job, jobId);
+ MonitorInfo monitorInfo = duccWebMonitor.renew(MonitorType.Job, jobId);
Gson gson = new Gson();
String jSon = gson.toJson(monitorInfo);
duccLogger.debug(location, jobid, jSon);
@@ -118,7 +117,7 @@ public class DuccHandlerProxy extends Du
duccLogger.trace(location, jobid, "enter");
duccLogger.info(location, jobid, request.toString());
- ConcurrentHashMap<DuccId,Long> eMap = duccWebMonitor.getExpiryMap(DuccType.Job);
+ ConcurrentHashMap<DuccId,Long> eMap = duccWebMonitor.getExpiryMap(MonitorType.Job);
Gson gson = new Gson();
String jSon = gson.toJson(eMap);
@@ -131,13 +130,56 @@ public class DuccHandlerProxy extends Du
private void handleServletReservationStatus(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- handleServletManagedReservationStatus(target, baseRequest, request, response);
+ String location = "handleServletReservationStatus";
+ duccLogger.trace(location, jobid, "enter");
+ duccLogger.info(location, jobid, request.toString());
+
+ String id = request.getParameter("id");
+
+ if(id != null) {
+ id = id.trim();
+ }
+ else {
+ id = "";
+ }
+
+ if(isIdMissing(id)) {
+ String message = "id missing";
+ duccLogger.info(location, jobid, message);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
+ }
+ else if(isIdInvalid(id)) {
+ String message = "id invalid";
+ duccLogger.info(location, jobid, message);
+ response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
+ }
+ else {
+ MonitorInfo monitorInfo = duccWebMonitor.renew(MonitorType.UnmanagedReservation, id);
+ Gson gson = new Gson();
+ String jSon = gson.toJson(monitorInfo);
+ duccLogger.debug(location, jobid, jSon);
+ response.getWriter().println(jSon);
+ response.setContentType("application/json");
+ }
+
+ duccLogger.trace(location, jobid, "exit");
}
private void handleServletReservationMonitorReport(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException
{
- handleServletManagedReservationMonitorReport(target, baseRequest,request, response);
+ String location = "handleServletReservationMonitorReport";
+ duccLogger.trace(location, jobid, "enter");
+ duccLogger.info(location, jobid, request.toString());
+
+ ConcurrentHashMap<DuccId,Long> eMap = duccWebMonitor.getExpiryMap(MonitorType.UnmanagedReservation);
+
+ Gson gson = new Gson();
+ String jSon = gson.toJson(eMap);
+ duccLogger.debug(location, jobid, jSon);
+ response.getWriter().println(jSon);
+ response.setContentType("application/json");
+ duccLogger.trace(location, jobid, "exit");
}
private void handleServletManagedReservationStatus(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
@@ -167,7 +209,7 @@ public class DuccHandlerProxy extends Du
response.sendError(HttpServletResponse.SC_BAD_REQUEST, message);
}
else {
- MonitorInfo monitorInfo = duccWebMonitor.renew(DuccType.Reservation, id);
+ MonitorInfo monitorInfo = duccWebMonitor.renew(MonitorType.ManagedReservation, id);
Gson gson = new Gson();
String jSon = gson.toJson(monitorInfo);
duccLogger.debug(location, jobid, jSon);
@@ -185,7 +227,7 @@ public class DuccHandlerProxy extends Du
duccLogger.trace(location, jobid, "enter");
duccLogger.info(location, jobid, request.toString());
- ConcurrentHashMap<DuccId,Long> eMap = duccWebMonitor.getExpiryMap(DuccType.Reservation, ReservationType.Managed);
+ ConcurrentHashMap<DuccId,Long> eMap = duccWebMonitor.getExpiryMap(MonitorType.ManagedReservation);
Gson gson = new Gson();
String jSon = gson.toJson(eMap);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java?rev=1678184&r1=1678183&r2=1678184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccWebMonitor.java Thu May 7 12:54:50 2015
@@ -29,10 +29,6 @@ import org.apache.uima.ducc.common.utils
import org.apache.uima.ducc.common.utils.id.DuccId;
import org.apache.uima.ducc.orchestrator.authentication.DuccWebAdministrators;
import org.apache.uima.ducc.transport.event.OrchestratorStateDuccEvent;
-import org.apache.uima.ducc.transport.event.common.DuccWorkReservation;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
-import org.apache.uima.ducc.transport.event.common.IDuccWork;
-import org.apache.uima.ducc.ws.DuccData;
import org.apache.uima.ducc.ws.IListenerOrchestrator;
public class DuccWebMonitor implements IListenerOrchestrator, IWebMonitor {
@@ -66,7 +62,7 @@ public class DuccWebMonitor implements I
private DuccWebMonitorJob duccWebMonitorJob = null;
private DuccWebMonitorManagedReservation duccWebMonitorManagedReservation = null;
private DuccWebMonitorReservation duccWebMonitorReservation = null;
-
+
public static DuccWebMonitor getInstance() {
return instance;
}
@@ -112,30 +108,6 @@ public class DuccWebMonitor implements I
duccWebMonitorReservation = new DuccWebMonitorReservation(timeoutMillis);
}
- private ReservationType getReservationType(String id) {
- ReservationType rt = ReservationType.Managed;
- DuccData duccData = DuccData.getInstance();
- IDuccWork dw = duccData.getReservation(id);
- if(dw != null) {
- if(dw instanceof DuccWorkReservation) {
- rt = ReservationType.Unmanaged;
- }
- }
- return rt;
- }
-
- private ReservationType getReservationType(DuccId duccId) {
- ReservationType rt = ReservationType.Managed;
- DuccData duccData = DuccData.getInstance();
- IDuccWork dw = duccData.getReservation(duccId);
- if(dw != null) {
- if(dw instanceof DuccWorkReservation) {
- rt = ReservationType.Unmanaged;
- }
- }
- return rt;
- }
-
public void update(OrchestratorStateDuccEvent duccEvent) {
String location = "update";
duccLogger.trace(location, jobid, "enter");
@@ -212,25 +184,19 @@ public class DuccWebMonitor implements I
}
- public MonitorInfo renew(DuccType duccType, String id) {
+ public MonitorInfo renew(MonitorType monitorType, String id) {
MonitorInfo monitorInfo = new MonitorInfo();
- if(duccType != null) {
+ if(monitorType != null) {
if(id != null) {
- switch(duccType) {
+ switch(monitorType) {
case Job:
monitorInfo = duccWebMonitorJob.renew(id, updateCounter);
break;
- case Reservation:
- switch(getReservationType(id)) {
- case Managed:
- monitorInfo = duccWebMonitorManagedReservation.renew(id, updateCounter);
- break;
- case Unmanaged:
- monitorInfo = duccWebMonitorReservation.renew(id, updateCounter);
- break;
- }
+ case ManagedReservation:
+ monitorInfo = duccWebMonitorManagedReservation.renew(id, updateCounter);
break;
- case Service:
+ case UnmanagedReservation:
+ monitorInfo = duccWebMonitorReservation.renew(id, updateCounter);
break;
default:
break;
@@ -241,25 +207,19 @@ public class DuccWebMonitor implements I
}
- public Long getExpiry(DuccType duccType, DuccId duccId) {
+ public Long getExpiry(MonitorType monitorType, DuccId duccId) {
Long expiry = null;
- if(duccType != null) {
+ if(monitorType != null) {
if(duccId != null) {
- switch(duccType) {
+ switch(monitorType) {
case Job:
expiry = duccWebMonitorJob.getExpiry(duccId);
break;
- case Reservation:
- switch(getReservationType(duccId)) {
- case Managed:
- expiry = duccWebMonitorManagedReservation.getExpiry(duccId);
- break;
- case Unmanaged:
- expiry = duccWebMonitorReservation.getExpiry(duccId);
- break;
- }
+ case ManagedReservation:
+ expiry = duccWebMonitorManagedReservation.getExpiry(duccId);
break;
- case Service:
+ case UnmanagedReservation:
+ expiry = duccWebMonitorReservation.getExpiry(duccId);
break;
default:
break;
@@ -270,25 +230,19 @@ public class DuccWebMonitor implements I
}
- public boolean isCanceled(DuccType duccType, DuccId duccId) {
+ public boolean isCanceled(MonitorType monitorType, DuccId duccId) {
boolean flag = false;
- if(duccType != null) {
+ if(monitorType != null) {
if(duccId != null) {
- switch(duccType) {
+ switch(monitorType) {
case Job:
flag = duccWebMonitorJob.isCanceled(duccId);
break;
- case Reservation:
- switch(getReservationType(duccId)) {
- case Managed:
- flag = duccWebMonitorManagedReservation.isCanceled(duccId);
- break;
- case Unmanaged:
- flag = duccWebMonitorReservation.isCanceled(duccId);
- break;
- }
+ case ManagedReservation:
+ flag = duccWebMonitorManagedReservation.isCanceled(duccId);
break;
- case Service:
+ case UnmanagedReservation:
+ flag = duccWebMonitorReservation.isCanceled(duccId);
break;
default:
break;
@@ -299,24 +253,18 @@ public class DuccWebMonitor implements I
}
- public ConcurrentHashMap<DuccId,Long> getExpiryMap(DuccType duccType, ReservationType rt) {
+ public ConcurrentHashMap<DuccId,Long> getExpiryMap(MonitorType monitorType) {
ConcurrentHashMap<DuccId,Long> eMap = new ConcurrentHashMap<DuccId,Long>();
- if(duccType != null) {
- switch(duccType) {
+ if(monitorType != null) {
+ switch(monitorType) {
case Job:
eMap = duccWebMonitorJob.getExpiryMap();
break;
- case Reservation:
- switch(rt) {
- case Managed:
- eMap = duccWebMonitorManagedReservation.getExpiryMap();
- break;
- case Unmanaged:
- eMap = duccWebMonitorReservation.getExpiryMap();
- break;
- }
+ case ManagedReservation:
+ eMap = duccWebMonitorManagedReservation.getExpiryMap();
break;
- case Service:
+ case UnmanagedReservation:
+ eMap = duccWebMonitorReservation.getExpiryMap();
break;
default:
break;
@@ -325,9 +273,4 @@ public class DuccWebMonitor implements I
return eMap;
}
- @Override
- public ConcurrentHashMap<DuccId, Long> getExpiryMap(DuccType duccType) {
- return getExpiryMap(duccType, ReservationType.Managed);
- }
-
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java?rev=1678184&r1=1678183&r2=1678184&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/IWebMonitor.java Thu May 7 12:54:50 2015
@@ -22,17 +22,15 @@ import java.util.concurrent.ConcurrentHa
import org.apache.uima.ducc.common.json.MonitorInfo;
import org.apache.uima.ducc.common.utils.id.DuccId;
-import org.apache.uima.ducc.transport.event.common.IDuccTypes.DuccType;
public interface IWebMonitor {
- public enum ReservationType { Managed, Unmanaged };
-
+ public enum MonitorType { Job, ManagedReservation, UnmanagedReservation };
+
public void register(String host, String port);
public boolean isAutoCancelEnabled();
- public MonitorInfo renew(DuccType duccType, String id);
- public Long getExpiry(DuccType duccType, DuccId duccId);
- public ConcurrentHashMap<DuccId,Long> getExpiryMap(DuccType duccType);
- public ConcurrentHashMap<DuccId,Long> getExpiryMap(DuccType duccType, ReservationType rt);
- public boolean isCanceled(DuccType duccType, DuccId duccId);
+ public MonitorInfo renew(MonitorType monitorType, String id);
+ public Long getExpiry(MonitorType monitorType, DuccId duccId);
+ public ConcurrentHashMap<DuccId,Long> getExpiryMap(MonitorType monitorType);
+ public boolean isCanceled(MonitorType monitorType, DuccId duccId);
}