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/10/28 19:01:28 UTC
svn commit: r1536456 - in /uima/sandbox/uima-ducc/trunk/src/main/admin:
check_ducc start_ducc
Author: challngr
Date: Mon Oct 28 18:01:28 2013
New Revision: 1536456
URL: http://svn.apache.org/r1536456
Log:
UIMA-3260 Only run thorugh config checking if the nodelist is also the default nodelist.
Modified:
uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc
Modified: uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc?rev=1536456&r1=1536455&r2=1536456&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/check_ducc Mon Oct 28 18:01:28 2013
@@ -268,8 +268,8 @@ class CheckDucc(DuccUtil):
if ( config_only ):
- if ( len(nodefiles) > 1 ):
- print "NOTOK: Config check: specify a single master nodefile only."
+ if ( nodefiles != self.default_nodefiles):
+ print "NOTOK: Config check only works with full, default nodefile:", self.default_nodefiles
return
if self.verify_class_configuration(nodefiles[0], verbose):
print "OK: Class configuration checked"
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=1536456&r1=1536455&r2=1536456&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc (original)
+++ uima/sandbox/uima-ducc/trunk/src/main/admin/start_ducc Mon Oct 28 18:01:28 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', "'")
@@ -292,7 +292,7 @@ class StartDucc(DuccUtil):
print "Can't read nodefile", nf
ok = False
- if ok and (len(nodefiles) == 1):
+ if ok and (nodefiles == self.default_nodefiles):
if self.verify_class_configuration(nodefiles[0], False):
print "OK: Class configuration checked"
else: