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 2019/07/29 15:15:13 UTC
svn commit: r1863946 - in /uima/uima-ducc/trunk:
uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Author: degenaro
Date: Mon Jul 29 15:15:13 2019
New Revision: 1863946
URL: http://svn.apache.org/viewvc?rev=1863946&view=rev
Log:
UIMA-6101 DUCC demo on Apache moved to vm3: userid duccy --> ducc
Modified:
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
Modified: uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties?rev=1863946&r1=1863945&r2=1863946&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties (original)
+++ uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/site.ducc.properties Mon Jul 29 15:15:13 2019
@@ -45,9 +45,9 @@ ducc.broker.jmx.port=9999
ducc.broker.configuration = conf/activemq-ducc-unsecure.xml
# for Sun (Oracle) JVM: -XX:+HeapDumpOnOutOfMemoryError
-# for Sun (Oracle) JVM: -XX:HeapDumpPath=/home/duccy/dump
+# for Sun (Oracle) JVM: -XX:HeapDumpPath=/home/ducc/dump
-ducc.heap.dump.path = /home/duccy/dump
+ducc.heap.dump.path = /home/ducc/dump
ducc.broker.memory.options = -Xmx300M -XX:+HeapDumpOnOutOfMemoryError
ducc.agent.jvm.args = -Xmx150M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=${ducc.heap.dump.path}
@@ -74,6 +74,6 @@ ducc.service.configuration.class=org.apa
ducc.rm.fragmentation.threshold = 1
ducc.rm.share.quantum = 15
-ducc.agent.rogue.process.user.exclusion.filter=root,postfix,ntp,nobody,daemon,100,degenaro,messagebus,nslcd,syslog,whoopsie,duccy
+ducc.agent.rogue.process.user.exclusion.filter=root,postfix,ntp,nobody,daemon,100,degenaro,messagebus,nslcd,syslog,whoopsie,ducc
ducc.agent.node.metrics.publish.rate=10000
ducc.agent.node.inventory.publish.rate=5000
Modified: uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh?rev=1863946&r1=1863945&r2=1863946&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh (original)
+++ uima/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/cron/cleanup.sh Mon Jul 29 15:15:13 2019
@@ -18,21 +18,21 @@
# under the License.
# -----------------------------------------------------------------------
-# handle /home/duccy/spool/
+# handle /home/ducc/spool/
-togo=`find /home/duccy/spool/* -mtime +21 -user duccy`
+togo=`find /home/ducc/spool/* -mtime +21 -user ducc`
echo Removing $togo
-`find /home/duccy/spool/* -mtime +21 -user duccy | xargs -i rm -rf {}`
+`find /home/ducc/spool/* -mtime +21 -user ducc | xargs -i rm -rf {}`
-# handle /home/duccy/ducc/logs/
+# handle /home/ducc/ducc/logs/
-togo=`find /home/duccy/ducc/logs/* -mtime +21 -user duccy`
+togo=`find /home/ducc/ducc/logs/* -mtime +21 -user ducc`
echo Removing $togo
-`find /home/duccy/ducc/logs/* -mtime +21 -user duccy | xargs -i rm -rf {}`
+`find /home/ducc/ducc/logs/* -mtime +21 -user ducc | xargs -i rm -rf {}`
# handle /tmp/UIMA*
-togo=`find /tmp -mtime +21 -user duccy`
+togo=`find /tmp -mtime +21 -user ducc`
echo Removing $togo
-`find /tmp -mtime +21 -user duccy | xargs -i rm -rf {}`
+`find /tmp -mtime +21 -user ducc | xargs -i rm -rf {}`
Modified: uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java
URL: http://svn.apache.org/viewvc/uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java?rev=1863946&r1=1863945&r2=1863946&view=diff
==============================================================================
--- uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java (original)
+++ uima/uima-ducc/trunk/uima-ducc-sm/src/main/java/org/apache/uima/ducc/sm/ServiceHandler.java Mon Jul 29 15:15:13 2019
@@ -343,13 +343,15 @@ public class ServiceHandler
/**
* This is called when an endpoint is referenced as a dependent service from a job or a service.
- * It is called only when a new job or service is first discovred in the OR map.
+ * It is called only when a new job or service is first discovered in the OR map.
*/
protected Map<String, ServiceSet> resolveDependencies(DuccWorkJob w, ServiceDependency s)
{
- //String methodName = "resolveDependencies";
+ String methodName = "resolveDependencies";
DuccId id = w.getDuccId();
String[] deps = w.getServiceDependencies();
+
+ logger.info(methodName, id, deps.length);
// New services, if any are discovered
// Put them into the global map of known services if needed and up the ref count
@@ -358,6 +360,7 @@ public class ServiceHandler
for ( String dep : deps ) {
ServiceSet sset = serviceStateHandler.getServiceByUrl(dep);
if ( sset == null ) {
+ logger.info(methodName, id, dep, "Service is unknown");
s.addMessage(dep, "Service is unknown.");
s.setState(ServiceState.NotAvailable);
fatal = true;
@@ -370,7 +373,7 @@ public class ServiceHandler
jobServices.clear();
} else {
for ( ServiceSet sset : jobServices.values() ) {
- // If service is unregistered and then rerigistered while the job is running it may have lost
+ // If service is unregistered and then re-registered while the job is running it may have lost
// its connections, which we insure we always have here.
serviceStateHandler.putServiceForJob(w.getDuccId(), sset);
sset.reference(id); // might start it if it's not running
@@ -1535,7 +1538,7 @@ public class ServiceHandler
private Map<Long, ServiceSet> servicesByImplementor = new HashMap<Long, ServiceSet>();
// // For each job, the collection of services it is dependent upon
-// // DUccId is a Job Id (or id for serice that has dependencies)
+// // DUccId is a Job Id (or id for service that has dependencies)
private Map<DuccId, Map<Long, ServiceSet>> servicesByJob = new HashMap<DuccId, Map<Long, ServiceSet>>();
/*