Author: burn
Date: Sun Apr 10 22:13:26 2016
New Revision: 1738473
URL: http://svn.apache.org/viewvc?rev=1738473&view=rev
Log:
UIMA-4656 Make check_ducc recognize db & broker; start db only when requested
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc
uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py?rev=1738473&r1=1738472&r2=1738473&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/ducc_util.py Sun Apr 10
22:13:26 2016
@@ -691,9 +691,19 @@ class DuccUtil(DuccBase):
answer.append(dp)
cont = True
break
+ if ( tok.startswith('-DDUCC_BROKER_CREDENTIALS_FILE=') ):
+ dp = ('broker', pid, user)
+ answer.append(dp)
+ cont = True
+ break
if ( cont ): # stupid python only continues out of
inner loop
continue
-
+ if fullargs[-1] == 'org.apache.cassandra.service.CassandraDaemon':
+ dp = ('database', pid, user)
+ answer.append(dp)
+ continue
+
+ # Look for site-specific processes
other_processes = find_other_processes(pid, user, line)
if ( type(other_processes) is list ):
if ( len(other_processes) > 0 ):
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc?rev=1738473&r1=1738472&r2=1738473&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc Sun Apr 10 22:13:26
2016
@@ -311,17 +311,18 @@ class StartDucc(DuccUtil):
print sys.exc_info()[0], "DUCC may not be started
correctly."
sys.exit(1)
- try:
- self.db_start()
- except Exception (e):
- # print e
- print sys.exc_info()[0], "Can't start the database."
- sys.exit(1)
+ if ( 'db' in components ):
+ try:
+ self.db_start()
+ except Exception (e):
+ # print e
+ print sys.exc_info()[0], "Can't start the database."
+ sys.exit(1)
if ( self.is_amq_active() ):
print 'ActiveMQ broker is found on configured host and port:',
self.broker_host + ':' + self.broker_port
else:
- print 'ActiveMQ broker cannot be found on', self.broker_host + ':'
+ self.broker_port
+ print 'ActiveMQ broker is required but cannot be found on',
self.broker_host + ':' + self.broker_port
sys.exit(1)
ducc = Ducc()
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc?rev=1738473&r1=1738472&r2=1738473&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc Sun Apr 10 22:13:26
2016
@@ -133,12 +133,14 @@ class StopDucc(DuccUtil):
print ' stop_ducc -c agent@barnode -c or'
print ''
print ' Components include:'
- print ' rm - resource manager'
+ print ' agent - node agent'
+ print ' broker - AMQ broker'
+ print ' db - database'
print ' or - orchestrator'
print ' pm - process manager'
+ print ' rm - resource manager'
print ' sm - services manager'
print ' ws - web server'
- print ' agent - node agent'
print ''
print ' -w --wait'
print ' Time to wait for everything to come down, in seconds.
Default is 60.'
@@ -268,7 +270,7 @@ class StopDucc(DuccUtil):
except PropertiesException, (inst):
print inst.msg
print ''
- print 'Run check_ducc to refresh the PIDs file, or check_ducc
-k to search for and',
+ print 'Run check_ducc -p to refresh the PIDs file, or
check_ducc -k to search for and',
print 'kill all DUCC processes.'
print ''
sys.exit(1)
