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 2013/07/24 15:59:56 UTC
svn commit: r1506558 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server:
DuccHandlerJsonFormat.java DuccHandlerLegacy.java
Author: degenaro
Date: Wed Jul 24 13:59:56 2013
New Revision: 1506558
URL: http://svn.apache.org/r1506558
Log:
UIMA-3109 DUCC webserver (WS) fails to display init failures unless Job is capped
Modified:
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/DuccHandlerLegacy.java
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=1506558&r1=1506557&r2=1506558&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 Wed Jul 24 13:59:56 2013
@@ -216,29 +216,38 @@ public class DuccHandlerJsonFormat exten
row.add(new JsonPrimitive(sb.toString()));
// Init Fails
sb = new StringBuffer();
- if(job.getSchedulingInfo().getLongSharesMax() < 0) {
- switch(DuccCookies.getDisplayStyle(request)) {
- case Textual:
- default:
- sb.append(buildInitializeFailuresLink(job));
- sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
- sb.append("<sup>");
- sb.append("<small>");
- sb.append("capped");
- sb.append("</small>");
- sb.append("<sup>");
- sb.append("</span>");
- sb.append("<br>");
- break;
- case Visual:
- sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
- sb.append("<img src=\"./opensources/images/propeller_hat_small.svg.png\">");
- sb.append("</span>");
- sb.append("<br>");
+ long initFails = job.getProcessInitFailureCount();
+ if(initFails > 0) {
+ if(job.getSchedulingInfo().getLongSharesMax() < 0) {
+ switch(DuccCookies.getDisplayStyle(request)) {
+ case Textual:
+ default:
+ sb.append(buildInitializeFailuresLink(job));
+ sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
+ sb.append("<sup>");
+ sb.append("<small>");
+ sb.append("capped");
+ sb.append("</small>");
+ sb.append("<sup>");
+ sb.append("</span>");
+ sb.append("<br>");
+ break;
+ case Visual:
+ sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
+ sb.append("<img src=\"./opensources/images/propeller_hat_small.svg.png\">");
+ sb.append("</span>");
+ sb.append("<br>");
+ sb.append(buildInitializeFailuresLink(job));
+ break;
+ }
+ }
+ else {
sb.append(buildInitializeFailuresLink(job));
- break;
}
}
+ else {
+ sb.append(""+initFails);
+ }
row.add(new JsonPrimitive(sb.toString()));
// Run Fails
sb = new StringBuffer();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java?rev=1506558&r1=1506557&r2=1506558&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/java/org/apache/uima/ducc/ws/server/DuccHandlerLegacy.java Wed Jul 24 13:59:56 2013
@@ -197,29 +197,38 @@ public class DuccHandlerLegacy extends D
sb.append("</td>");
// Initialize Failures
sb.append("<td valign=\"bottom\" align=\"right\">");
- if(job.getSchedulingInfo().getLongSharesMax() < 0) {
- switch(DuccCookies.getDisplayStyle(request)) {
- case Textual:
- default:
- sb.append(buildInitializeFailuresLink(job));
- sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
- sb.append("<sup>");
- sb.append("<small>");
- sb.append("capped");
- sb.append("</small>");
- sb.append("<sup>");
- sb.append("</span>");
- sb.append("<br>");
- break;
- case Visual:
- sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
- sb.append("<img src=\"./opensources/images/propeller_hat_small.svg.png\">");
- sb.append("</span>");
- sb.append("<br>");
+ long initFails = job.getProcessInitFailureCount();
+ if(initFails > 0) {
+ if(job.getSchedulingInfo().getLongSharesMax() < 0) {
+ switch(DuccCookies.getDisplayStyle(request)) {
+ case Textual:
+ default:
+ sb.append(buildInitializeFailuresLink(job));
+ sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
+ sb.append("<sup>");
+ sb.append("<small>");
+ sb.append("capped");
+ sb.append("</small>");
+ sb.append("<sup>");
+ sb.append("</span>");
+ sb.append("<br>");
+ break;
+ case Visual:
+ sb.append("<span title=\"capped at current number of running processes due to excessive initialization failures\">");
+ sb.append("<img src=\"./opensources/images/propeller_hat_small.svg.png\">");
+ sb.append("</span>");
+ sb.append("<br>");
+ sb.append(buildInitializeFailuresLink(job));
+ break;
+ }
+ }
+ else {
sb.append(buildInitializeFailuresLink(job));
- break;
}
}
+ else {
+ sb.append(""+initFails);
+ }
sb.append("</td>");
// Runtime Failures
sb.append("<td valign=\"bottom\" align=\"right\">");