You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by bu...@apache.org on 2015/03/20 16:15:34 UTC
svn commit: r1668046 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
Author: burn
Date: Fri Mar 20 15:15:33 2015
New Revision: 1668046
URL: http://svn.apache.org/r1668046
Log:
UIMA-4297 Also clean up '<request> <id> submitted' msgs & code that scraps them
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java?rev=1668046&r1=1668045&r2=1668046&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationSubmit.java Fri Mar 20 15:15:33 2015
@@ -161,7 +161,7 @@ public class DuccReservationSubmit
if ( rc ) {
// Fetch the Ducc ID
- System.out.println("Process " + ds.getDuccId() + " submitted.");
+ System.out.println("Reservation " + ds.getDuccId() + " submitted.");
System.out.println("resID = " + ds.getDuccId() + " "+ds.info);
String nodes = ds.getHostsAsString().trim();
if(nodes.length() == 0) {
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1668046&r1=1668045&r2=1668046&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java Fri Mar 20 15:15:33 2015
@@ -251,7 +251,7 @@ public class DuccServiceSubmit
try {
reply = (SubmitServiceReplyDuccEvent) dispatcher.dispatchAndWaitForDuccReply(ev);
} catch (Exception e) {
- message("Process not submitted:", e.getMessage());
+ message("Service instance not submitted:", e.getMessage());
return false;
} finally {
dispatcher.close();
@@ -286,7 +286,7 @@ public class DuccServiceSubmit
if ( rc ) {
// Fetch the Ducc ID
- System.out.println("Service " + ds.getDuccId() + " submitted");
+ System.out.println("Service instance " + ds.getDuccId() + " submitted");
System.exit(0);
} else {
System.out.println("Could not submit Service");
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java?rev=1668046&r1=1668045&r2=1668046&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceInstance.java Fri Mar 20 15:15:33 2015
@@ -264,10 +264,11 @@ class ServiceInstance
continue;
}
+ // e.g. Service instance 18803 submitted
if ( s.startsWith("Service") && s.endsWith("submitted") ) {
String[] toks = s.split("\\s");
try {
- numeric_id = Long.parseLong(toks[1]);
+ numeric_id = Long.parseLong(toks[2]);
started = true;
logger.info(methodName, null, "Request to start service " + sset.getId().toString() + " accepted as service instance ", numeric_id);
} catch ( NumberFormatException e ) {