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/03/19 20:04:09 UTC
svn commit: r1667849 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main:
java/org/apache/uima/ducc/ws/server/DuccHandler.java webapp/root/js/ducc.js
webapp/root/submit.reservation.jsp
Author: degenaro
Date: Thu Mar 19 19:04:09 2015
New Revision: 1667849
URL: http://svn.apache.org/r1667849
Log:
UIMA-4293 DUCC Web Server (WS) reservation request improvements
[webserver]
- get rid of "instance" for reservations
Modified:
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/webapp/root/js/ducc.js
uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
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=1667849&r1=1667848&r2=1667849&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 Mar 19 19:04:09 2015
@@ -192,9 +192,8 @@ public class DuccHandler extends DuccAbs
private String duccServiceUpdateFormButton = duccContext+"/service-update-get-form-button";
private String duccReservationSchedulingClasses = duccContext+"/reservation-scheduling-classes";
- private String duccReservationInstanceMemorySizes = duccContext+"/reservation-instance-memory-sizes";
- private String duccReservationInstanceMemoryUnits = duccContext+"/reservation-instance-memory-units";
- private String duccReservationNumberOfInstances = duccContext+"/reservation-number-of-instances";
+ private String duccReservationInstanceMemorySizes = duccContext+"/reservation-memory-sizes";
+ private String duccReservationInstanceMemoryUnits = duccContext+"/reservation-memory-units";
protected String headProvider = "Provider";
@@ -3667,31 +3666,13 @@ public class DuccHandler extends DuccAbs
String methodName = "handleDuccServletReservationInstanceMemoryUnits";
duccLogger.trace(methodName, null, messages.fetch("enter"));
StringBuffer sb = new StringBuffer();
- sb.append("<select id=\"instance_memory_units\">");
+ sb.append("<select id=\"memory_units\">");
sb.append("<option value=\"GB\" selected=\"selected\">GB</option>");
sb.append("</select>");
response.getWriter().println(sb);
duccLogger.trace(methodName, null, messages.fetch("exit"));
}
- private void handleDuccServletReservationNumberOfInstances(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
- throws IOException, ServletException
- {
- String methodName = "handleDuccServletReservationNumberOfInstances";
- duccLogger.trace(methodName, null, messages.fetch("enter"));
- StringBuffer sb = new StringBuffer();
- sb.append("<select id=\"number_of_instances\">");
- sb.append("<option value=\"1\" selected=\"selected\">1</option>");
- int min = 1;
- int max = 9;
- for(int i=min+1;i<max+1;i++) {
- sb.append("<option value=\""+i+"\">"+i+"</option>");
- }
- sb.append("</select>");
- response.getWriter().println(sb);
- duccLogger.trace(methodName, null, messages.fetch("exit"));
- }
-
private void handleDuccServletReservationFormButton(String target,Request baseRequest,HttpServletRequest request,HttpServletResponse response)
throws IOException, ServletException
{
@@ -4157,14 +4138,10 @@ public class DuccHandler extends DuccAbs
if(isAuthenticated(request,response)) {
String scheduling_class = request.getParameter("scheduling_class");
duccLogger.debug(methodName, null, "scheduling_class:"+scheduling_class);
- String instance_memory_size = request.getParameter("instance_memory_size");
- duccLogger.debug(methodName, null, "instance_memory_size:"+instance_memory_size);
- String instance_memory_units = request.getParameter("instance_memory_units");
- duccLogger.debug(methodName, null, "instance_memory_units:"+instance_memory_units);
- /*
- String number_of_instances = request.getParameter("number_of_instances");
- duccLogger.debug(methodName, null, "number_of_instances:"+number_of_instances);
- */
+ String memory_size = request.getParameter("memory_size");
+ duccLogger.debug(methodName, null, "memory_size:"+memory_size);
+ String memory_units = request.getParameter("memory_units");
+ duccLogger.debug(methodName, null, "memory_units:"+memory_units);
String description = request.getParameter("description");
duccLogger.debug(methodName, null, "description:"+description);
String arg1 = "";
@@ -4175,23 +4152,15 @@ public class DuccHandler extends DuccAbs
}
String arg3 = "";
String arg4 = "";
- if(instance_memory_size != null) {
- arg3 = "--instance_memory_size";
- if(instance_memory_units != null) {
- arg4 = instance_memory_size+instance_memory_units;
+ if(memory_size != null) {
+ arg3 = "--memory_size";
+ if(memory_units != null) {
+ arg4 = memory_size+memory_units;
}
else {
- arg4 = instance_memory_size;
+ arg4 = memory_size;
}
}
- /*
- String arg5 = "";
- String arg6 = "";
- if(number_of_instances != null) {
- arg5 = "--number_of_instances";
- arg6 = number_of_instances;
- }
- */
String arg7 = "";
String arg8 = "";
if(description != null) {
@@ -4830,10 +4799,6 @@ public class DuccHandler extends DuccAbs
handleDuccServletReservationInstanceMemorySizes(target, baseRequest, request, response);
DuccWebUtil.noCache(response);
}
- else if(reqURI.startsWith(duccReservationNumberOfInstances)) {
- handleDuccServletReservationNumberOfInstances(target, baseRequest, request, response);
- DuccWebUtil.noCache(response);
- }
else if(reqURI.startsWith(duccReservationInstanceMemoryUnits)) {
handleDuccServletReservationInstanceMemoryUnits(target, baseRequest, request, response);
DuccWebUtil.noCache(response);
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js?rev=1667849&r1=1667848&r2=1667849&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/js/ducc.js Thu Mar 19 19:04:09 2015
@@ -1884,95 +1884,64 @@ function ducc_load_reservation_schedulin
}
}
-var wip_reservation_instance_memory_sizes = false;
+var wip_reservation_memory_sizes = false;
-function ducc_load_reservation_instance_memory_sizes() {
- var fname = "ducc_load_reservation_instance_memory_sizes";
+function ducc_load_reservation_memory_sizes() {
+ var fname = "ducc_load_reservation_memory_sizes";
var data = null;
- if(wip_reservation_instance_memory_sizes) {
+ if(wip_reservation_memory_sizes) {
ducc_console_warn(fname+" already in progress...")
return;
}
- wip_reservation_instance_memory_sizes = true;
+ wip_reservation_memory_sizes = true;
try {
- var servlet = "/ducc-servlet/reservation-instance-memory-sizes";
+ var servlet = "/ducc-servlet/reservation-memory-sizes";
var tomsecs = ms_timeout;
$.ajax({
url: servlet,
timeout: tomsecs
}).done(function(data) {
- wip_reservation_instance_memory_sizes = false;
- $("#instance_memory_sizes_area").html(data);
+ wip_reservation_memory_sizes = false;
+ $("#memory_sizes_area").html(data);
data = null;
ducc_console_success(fname);
}).fail(function(jqXHR, textStatus) {
- wip_reservation_instance_memory_sizes = false;
+ wip_reservation_memory_sizes = false;
ducc_console_fail(fname, textStatus);
});
} catch (err) {
- wip_reservation_instance_memory_sizes = false;
+ wip_reservation_memory_sizes = false;
ducc_error(fname, err);
}
}
-var wip_reservation_instance_memory_units = false;
+var wip_reservation_memory_units = false;
-function ducc_load_reservation_instance_memory_units() {
- var fname = "ducc_load_reservation_instance_memory_units";
+function ducc_load_reservation_memory_units() {
+ var fname = "ducc_load_reservation_memory_units";
var data = null;
- if(wip_reservation_instance_memory_units) {
+ if(wip_reservation_memory_units) {
ducc_console_warn(fname+" already in progress...")
return;
}
- wip_reservation_instance_memory_units = true;
+ wip_reservation_memory_units = true;
try {
- var servlet = "/ducc-servlet/reservation-instance-memory-units";
+ var servlet = "/ducc-servlet/reservation-memory-units";
var tomsecs = ms_timeout;
$.ajax({
url: servlet,
timeout: tomsecs
}).done(function(data) {
- wip_reservation_instance_memory_units = false;
- $("#instance_memory_units_area").html(data);
+ wip_reservation_memory_units = false;
+ $("#memory_units_area").html(data);
data = null;
ducc_console_success(fname);
}).fail(function(jqXHR, textStatus) {
- wip_reservation_instance_memory_units = false;
+ wip_reservation_memory_units = false;
ducc_console_fail(fname, textStatus);
});
} catch (err) {
- wip_reservation_instance_memory_units = false;
- ducc_error(fname, err);
- }
-}
-
-var wip_reservation_number_of_instances = false;
-
-function ducc_load_reservation_number_of_instances() {
- var fname = "ducc_load_reservation_number_of_instances";
- var data = null;
- if(wip_reservation_number_of_instances) {
- ducc_console_warn(fname+" already in progress...")
- return;
- }
- wip_reservation_number_of_instances = true;
- try {
- var servlet = "/ducc-servlet/reservation-number-of-instances";
- var tomsecs = ms_timeout;
- $.ajax({
- url: servlet,
- timeout: tomsecs
- }).done(function(data) {
- wip_reservation_number_of_instances = false;
- $("#number_of_instances_area").html(data);
- data = null;
- ducc_console_success(fname);
- }).fail(function(jqXHR, textStatus) {
- wip_reservation_number_of_instances = false;
- ducc_console_fail(fname, textStatus);
- });
- } catch (err) {
- wip_reservation_number_of_instances = false;
+ wip_reservation_memory_units = false;
ducc_error(fname, err);
}
}
@@ -2012,9 +1981,8 @@ function ducc_load_submit_reservation_da
var fname = "ducc_load_submit_reservation_data";
try {
ducc_load_reservation_scheduling_classes();
- ducc_load_reservation_instance_memory_sizes();
- ducc_load_reservation_instance_memory_units();
- ducc_load_reservation_number_of_instances();
+ ducc_load_reservation_memory_sizes();
+ ducc_load_reservation_memory_units();
ducc_load_reservation_submit_button();
ducc_load_common();
} catch (err) {
@@ -3574,12 +3542,10 @@ function ducc_submit_reservation() {
try {
var e = document.getElementById("scheduling_class");
var scheduling_class = e.options[e.selectedIndex].value;
- var e = document.getElementById("instance_memory_size");
- var instance_memory_size = e.value;
- var e = document.getElementById("instance_memory_units");
- var instance_memory_units = e.options[e.selectedIndex].value;
- var e = document.getElementById("number_of_instances");
- var number_of_instances = e.options[e.selectedIndex].value;
+ var e = document.getElementById("memory_size");
+ var memory_size = e.value;
+ var e = document.getElementById("memory_units");
+ var memory_units = e.options[e.selectedIndex].value;
var e = document.getElementById("description");
var description = e.value;
var e = document.getElementById("wait_for_result_yes");
@@ -3592,11 +3558,9 @@ function ducc_submit_reservation() {
type: 'POST',
async: false,
url: "/ducc-servlet/reservation-submit-request",
- //data: {'scheduling_class':scheduling_class,'instance_memory_size':instance_memory_size,'instance_memory_units':instance_memory_units,'number_of_instances':number_of_instances,'description':description},
data: {
'scheduling_class': scheduling_class,
- 'instance_memory_size': instance_memory_size,
- 'number_of_instances': number_of_instances,
+ 'memory_size': memory_size,
'description': description
},
success: function(data) {
@@ -3618,11 +3582,9 @@ function ducc_submit_reservation() {
$.ajax({
type: 'POST',
url: "/ducc-servlet/reservation-submit-request",
- //data: {'scheduling_class':scheduling_class,'instance_memory_size':instance_memory_size,'instance_memory_units':instance_memory_units,'number_of_instances':number_of_instances,'description':description},
data: {
'scheduling_class': scheduling_class,
- 'instance_memory_size': instance_memory_size,
- 'number_of_instances': number_of_instances,
+ 'memory_size': memory_size,
'description': description
},
success: function(data) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp?rev=1667849&r1=1667848&r2=1667849&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-web/src/main/webapp/root/submit.reservation.jsp Thu Mar 19 19:04:09 2015
@@ -110,22 +110,17 @@ under the License.
<tr>
<td align="right">memory size
<td align="right">
- <td align="left" ><input id="instance_memory_size" type="text" list="sizes">
+ <td align="left" ><input id="memory_size" type="text" list="sizes">
<datalist id="sizes">
- <span id="instance_memory_sizes_area">
+ <span id="memory_sizes_area">
</span>
</datalist>
<tr>
<td align="right">memory units
<td align="right">
- <td align="left" ><span id="instance_memory_units_area">
- </span>
- <tr style="visibility: hidden;">
- <td align="right">number of instances
- <td align="right">
- <td align="left" ><span id="number_of_instances_area">
- </span>
- <tr style="visibility: hidden;">
+ <td align="left" ><span id="memory_units_area">
+ </span>
+ <tr>
<td align="right">wait for result
<td align="right">
<td align="left" ><span id="wait_for_result_area">