Author: challngr
Date: Wed Oct 23 18:41:41 2013
New Revision: 1535116
URL: http://svn.apache.org/r1535116
Log:
UIMA-3055 Forgot to remove -m (management) options which are pretty useless
anyway.
Modified:
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/start_ducc
URL:
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc?rev=1535116&r1=1535115&r2=1535116&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc Wed Oct 23 18:41:41
2013
@@ -36,7 +36,7 @@ from ducc_util import ThreadPool
class StartDucc(DuccUtil):
def start_broker(self):
-
+
broker_host = self.ducc_properties.get('ducc.broker.hostname')
print 'broker host', broker_host
lines = self.ssh(broker_host, True, "'", self.DUCC_HOME +
'/admin/ducc.py', '-c', 'broker', "'")
@@ -169,9 +169,7 @@ class StartDucc(DuccUtil):
print "Usage:"
print " start_ducc [options]"
print " If no options are given, all DUCC processes are
started, using the default"
- print " nodelist, DUCC_HOME/resources/ducc.nodes. This is the
equivalemnt of"
- print ""
- print " start_ducc -n $DUCC_HOME/resources/ducc.nodes -m"
+ print " nodelist, DUCC_HOME/resources/ducc.nodes. "
print ""
print "Options:"
print " -n --nodelist nodefile"
@@ -205,10 +203,7 @@ class StartDucc(DuccUtil):
print ""
print "Examples:"
print " Start all DUCC processes, using custom nodelists:"
- print " start_ducc -m -n foo.nodes -n bar.nodes"
- print ""
- print " Start just managemnet processes:"
- print " start_ducc -m"
+ print " start_ducc -n foo.nodes -n bar.nodes"
print ""
print " Start just agents on a specific set of nodes:"
print " start_ducc -n foo.nodes -n bar.nodes"
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=1535116&r1=1535115&r2=1535116&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/stop_ducc Wed Oct 23 18:41:41
2013
@@ -123,12 +123,6 @@ class StopDucc(DuccUtil):
print ''
print ' stop_ducc -n foo.nodes -n bar.nodes -n baz.nodes'
print ''
- print ' -q --quiesce nodefile'
- print ' Queesce the nodes in the nodefile.'
- print ''
- print ' -m --management'
- print ' Stop the management processes (rm, pm, sm, or, and ws).'
- print ''
print ' -c --component component'
print ' Stop a specific component. The component may be
qualified with the node name'
print ' using the @ symbol: component@node.'
@@ -172,7 +166,6 @@ class StopDucc(DuccUtil):
components = []
nodefiles = []
- management = False
do_agents = False
do_components = False
force = False
@@ -180,7 +173,7 @@ class StopDucc(DuccUtil):
all = False
try:
- opts, args = getopt.getopt(argv, 'ac:n:kmmn:qh?v', ['all',
'component=', 'components=', 'help', 'nodelist=', 'management', 'kill',
'quiesce', 'nothreading'])
+ opts, args = getopt.getopt(argv, 'ac:n:kn:qh?v', ['all',
'component=', 'components=', 'help', 'nodelist=', 'kill', 'quiesce',
'nothreading'])
except:
self.invalid('Invalid arguments ' + ' '.join(argv))
@@ -188,9 +181,6 @@ class StopDucc(DuccUtil):
if o in ('-c', '--component', '--components'):
components.append(a)
do_components = True
- elif o in ( '-m', '--management' ):
- management = True
- components = self.default_components
elif o in ( '-a', '--all' ):
all = True
components = self.default_components
@@ -215,8 +205,6 @@ class StopDucc(DuccUtil):
self.invalid('bad arg: ' + a)
if ( quiesce ):
- if ( management ):
- self.invalid("May not quiesce management nodes.")
if ( all ):
self.invalid("May not quiesce 'all'.");
if ( force ):
@@ -226,14 +214,10 @@ class StopDucc(DuccUtil):
self.invalid("Only agents may be quiesced.")
- # 'management' means stop all the management daemons - if specific
components are also specified
- # there is at least a redundancy and maybe also a conflict.
- if ( do_components and management ):
- self.invalid("The --management and --compoent options are mutually
exclusive")
# avaid confusion by insuring that if 'all', then nothing else is
specified
- if ( all and ( do_components or management ) ):
- self.invalid("The --all option is mutually exclusive with
--management and --component")
+ if ( all and ( do_components ) ):
+ self.invalid("The --all option is mutually exclusive with
--component")
# 'all' means everything. we use broadcast. should use check_ducc to
make sure
# it actually worked, and find the stragglers.
