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 2014/05/23 20:49:25 UTC
svn commit: r1597155 - in
/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config:
patches/admin/ducc.py resources/ducc.properties
Author: degenaro
Date: Fri May 23 18:49:25 2014
New Revision: 1597155
URL: http://svn.apache.org/r1597155
Log:
UIMA-3838 uima-ducc-vm.a.o demo: adjustments for 1.1.0
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/patches/admin/ducc.py
uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/patches/admin/ducc.py
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/patches/admin/ducc.py?rev=1597155&r1=1597154&r2=1597155&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/patches/admin/ducc.py (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/patches/admin/ducc.py Fri May 23 18:49:25 2014
@@ -61,6 +61,9 @@ class Ducc(DuccUtil):
print "Started AMQ broker"
+ def add_to_classpath(self, lib):
+ os.environ['CLASSPATH'] = os.environ['CLASSPATH'] + ":" + lib
+
def run_component(self, component, or_parms, numagents, rmoverride, background, nodup, localdate, single_user):
if ( component == 'all' ):
@@ -72,6 +75,8 @@ class Ducc(DuccUtil):
# ducc-head needs to be in system properties before the ducc daemon reads ducc.properties
# to insure it can be substituted properly
ducc_head = self.ducc_properties.get('ducc.head')
+ ducc_home = self.DUCC_HOME
+ CLASSPATH = os.environ['CLASSPATH']
jvm_opts = []
jvm_opts.append('-Djava.rmi.server.hostname=localhost')
@@ -145,17 +150,25 @@ class Ducc(DuccUtil):
if ( self.ws_jvm_args != None ):
jvm_opts.append(self.ws_jvm_args)
+ self.add_to_classpath(ducc_home + '/lib/http-client/*')
+ self.add_to_classpath(ducc_home + '/webserver/lib/*')
+ self.add_to_classpath(ducc_home + '/webserver/lib/jsp/*')
+
if ( c == 'viz' ):
here = os.getcwd()
os.chdir(self.DUCC_HOME + '/vizserver')
if ( self.ws_jvm_args != None ):
jvm_opts.append(self.ws_jvm_args)
+ self.add_to_classpath(ducc_home + '/lib/http-client/*')
+ self.add_to_classpath(ducc_home + '/vizserver/lib/*')
if ( c == 'orchestrator' ):
if ( or_parms != None ):
args = '-' + or_parms
if ( self.or_jvm_args != None ):
jvm_opts.append(self.or_jvm_args)
+ self.add_to_classpath(ducc_home + '/lib/http-client/*')
+ self.add_to_classpath(ducc_home + '/webserver/lib/*')
if ( c == 'pm' ):
if ( self.pm_jvm_args != None ):
@@ -164,12 +177,16 @@ class Ducc(DuccUtil):
if ( c == 'db' ):
if ( self.db_jvm_args != None ):
jvm_opts.append(self.db_jvm_args)
+ self.add_to_classpath(ducc_home + '/lib/derby/*')
+
if ( c == 'sm' ):
if ( self.sm_jvm_args != None ):
jvm_opts.append(self.sm_jvm_args)
+ self.add_to_classpath(ducc_home + '/apache-uima/apache-activemq/lib/optional/*')
+ self.add_to_classpath(ducc_home + '/lib/http-client/*')
+ self.add_to_classpath(ducc_home + '/webserver/lib/*')
-
if (component != 'agent'):
service = 'org.apache.uima.ducc.common.main.DuccService'
ducc_component = '-Dducc.deploy.components=' + component
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties?rev=1597155&r1=1597154&r2=1597155&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/config/resources/ducc.properties Fri May 23 18:49:25 2014
@@ -86,7 +86,7 @@ ducc.broker.jmx.port=9999
#
# ActiveMQ credentials file used to authenticate DUCC daemons with the broker.
#
-ducc.broker.credentials.file=${DUCC_HOME}/activemq/conf/ducc-broker-credentials.properties
+ducc.broker.credentials.file=${ducc.broker.home}/conf/ducc-broker-credentials.properties
# ActiveMQ Auto-management configuration
# docc.broker.automanage - if true, DUCC will start and stop the broker as needed.
@@ -102,7 +102,7 @@ ducc.broker.automanage = true
ducc.broker.memory.options = -Xmx300M
ducc.broker.configuration = conf/activemq-ducc.xml
-ducc.broker.home = ${DUCC_HOME}/activemq
+ducc.broker.home = ${DUCC_HOME}/apache-uima/apache-activemq
# transport.soWriteTimeout=45000, 45sec timeout on write operations to the socket.
ducc.broker.server.url.decoration = transport.soWriteTimeout=45000
@@ -247,6 +247,7 @@ ducc.threads.limit = 500
ducc.driver.jvm.args = -Xmx150M
# Extra JVM args to be appended to any user-supplied "process_jvm_args"
+# Dynamic: changes to this property immediately affect new submitted work
# ducc.process.jvm.args=-XX:+HeapDumpOnOutOfMemoryError
# ========== Job Driver Configuration block ==========
@@ -352,6 +353,9 @@ ducc.rm.prediction.fudge = 120000
# What is minimum number of processes for a job before we do defrag? If a job has less than this amount
# RM may attempt defragmentation to bring the processes up to this value.
ducc.rm.fragmentation.threshold = 1
+# Endpoint for RM admin CLI
+ducc.rm.admin.endpoint = ducc.rm.admin.channel
+ducc.rm.admin.endpoint.type = queue
# Agent Configuration block
ducc.agent.configuration.class=org.apache.uima.ducc.agent.config.AgentConfiguration
@@ -369,6 +373,10 @@ ducc.agent.managed.process.state.update.
# - synch=false - use socket transport for one-way messaging (no replies neeeded)
ducc.agent.managed.process.state.update.endpoint.params=transferExchange=true&sync=false
+# max UID reserved by OS. This is used to detect rogue processes and to report
+# available memory on a node.
+ducc.agent.node.metrics.sys.gid.max=500
+
ducc.agent.node.metrics.publish.rate=30000
ducc.agent.node.metrics.endpoint=ducc.node.metrics
# endpoint type choices[topic]