You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by ch...@apache.org on 2013/03/01 17:44:08 UTC
svn commit: r1451646 - in /uima/sandbox/uima-ducc/trunk:
uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/
uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/
Author: challngr
Date: Fri Mar 1 16:44:08 2013
New Revision: 1451646
URL: http://svn.apache.org/r1451646
Log:
UIMA-2665
Use blank " " instead of "," as separator for multiple services. The underlying problem was a
state snafu caused by not parsing multiple service deps as expected.
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java?rev=1451646&r1=1451645&r2=1451646&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccUiUtilities.java Fri Mar 1 16:44:08 2013
@@ -321,7 +321,7 @@ public class DuccUiUtilities {
return null;
}
- String[] deplist = dependency_string.split(",");
+ String[] deplist = dependency_string.split("\\s");
Map<String, String> resolved = new HashMap<String, String>();
if ( endpoint != null ) {
resolved.put(endpoint, endpoint);
@@ -383,7 +383,7 @@ public class DuccUiUtilities {
for ( String s : resolved.keySet() ) {
sb.append(s);
if ( (++ndx ) < len ) {
- sb.append(",");
+ sb.append(" ");
}
}
return sb.toString();
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java?rev=1451646&r1=1451645&r2=1451646&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/JobFactory.java Fri Mar 1 16:44:08 2013
@@ -551,7 +551,7 @@ public class JobFactory {
logger.debug(methodName, job.getDuccId(), "No service dependencies");
} else {
logger.debug(methodName, job.getDuccId(), "Adding service dependency", depstr);
- String[] deps = depstr.split(",");
+ String[] deps = depstr.split("\\s");
job.setServiceDependencies(deps);
}
// Service Endpoint
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java?rev=1451646&r1=1451645&r2=1451646&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/PingDriver.java Fri Mar 1 16:44:08 2013
@@ -340,7 +340,8 @@ class PingDriver
int my_ping_rate;
synchronized(ping_rate_sync) {
my_ping_rate = meta_ping_rate;
- if ( meta_ping_rate < META_PING_MAX ) {
+ if ( (meta_ping_rate < META_PING_MAX) && ( missed_pings == 0) ) {
+ // double, if not at max rate, and pinging is working
meta_ping_rate = Math.min(META_PING_MAX, meta_ping_rate * 2);
}
}
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java?rev=1451646&r1=1451645&r2=1451646&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceSet.java Fri Mar 1 16:44:08 2013
@@ -210,7 +210,7 @@ public class ServiceSet
String idprop = meta.getProperty("implementors", null);
if ( idprop != null ) {
- String[] ids = idprop.split(" ");
+ String[] ids = idprop.split("\\s");
for ( String i : ids ) {
friendly_ids.put(Long.parseLong(i), null);
}
@@ -368,7 +368,7 @@ public class ServiceSet
String[] result = null;
if ( depstr != null ) {
- result = depstr.split(",");
+ result = depstr.split("\\s");
for ( int i = 0; i < result.length; i++ ) {
result[i] = result[i].trim();
}
@@ -1139,7 +1139,7 @@ public class ServiceSet
logger.debug(methodName, id, "Start stdout:", s);
if ( s.startsWith("Service") && s.endsWith("submitted") ) {
- String[] toks = s.split(" ");
+ String[] toks = s.split("\\s");
long friendly = 0;
try {
friendly = Long.parseLong(toks[1]);