svn commit: r1677988 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts: runducc start_sim

[ch...@apache.org]

Author: challngr
Date: Wed May  6 13:53:34 2015
New Revision: 1677988

URL: http://svn.apache.org/r1677988
Log:
UIMA-4358 Updates for modified ducc_ling checks.

Modified:
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
    uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc?rev=1677988&r1=1677987&r2=1677988&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc Wed May  6 13:53:34 2015
@@ -545,7 +545,7 @@ class RunDucc(DuccUtil):
         print '   -b, --batchfile file'
         print '       This is the batch file describing the submissions. Required.'
         print ''
-        print '   -i, --init_time seconds'
+        print '   -i, --init_time milliseconds'
         print '       This is the AE initialization minimum time in seconds. Default:', self.init_time
         print ''
         print '   --init_timeout minutes'
@@ -562,14 +562,13 @@ class RunDucc(DuccUtil):
         print '       The JP will leak in process() until DUCC (hopefully) kills us'
         print ''
         print '   -r, --range seconds'
-        print '       This is the AE initializion time range over base in seconds. Default:', self.init_range
+        print '       This is the AE initializion time range over base in milliseconds. Default:', self.init_range
         print '       Init time is -i value + random[0, -rvalue]'
         print ''
         print '   -m, --memory_override mem-in-GB'
         print '       Use this instead of what is in the props file. Default: None'
         print ''
         print '   -n, --nmachines_override process_deployments_max'
-        print '       Override the preconfigured max machines. Use -1 to fully inhibit max machines'
         print ''
         print '   -o, --observe'
         print '       Specifies that we submit in keepalive mode and observe(watch) the jobs, creating a dir with outputs. Default:', self.observe
@@ -646,7 +645,7 @@ class RunDucc(DuccUtil):
         self.descriptor_as_file = False
 
         try:
-            opts, args  = getopt.getopt(argv, 'b:d:fi:m:nop:q:r:s:t:u:v:w:x:y:z:?h', ['AE', 'DD', 'file', 'SE=', 'IB=', 'PB=', 'directory=', 'batchfile=', 'init_time=',
+            opts, args  = getopt.getopt(argv, 'b:d:fi:m:n:op:q:r:s:t:u:v:w:x:y:z:?h', ['AE', 'DD', 'file', 'SE=', 'IB=', 'PB=', 'directory=', 'batchfile=', 'init_time=',
                                                                         'init_fail_cap=', 'range=', 'memory_override=', 'nmachines=', 'process_timeout=', 
                                                                         'init_timeout=', 'observe'
                                                                         'jd_uima_log=', 'jp_uima_log=',
@@ -671,7 +670,8 @@ class RunDucc(DuccUtil):
             elif o in ('-m', '--memory_override'):
                 self.memory_override = a
             elif o in ('-n', '--nmachines'):
-                self.max_machines = int(a)
+                self.max_machines = int(a)         # force ugly failure if not a number
+                self.max_machines = a
             elif o in ('-p', '--process_timeout'):
                 self.process_timeout = a
             elif o in ('-o', '--observe' ):

Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim?rev=1677988&r1=1677987&r2=1677988&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/start_sim Wed May  6 13:53:34 2015
@@ -80,7 +80,7 @@ class StartSim(DuccUtil):
 
         if ( not self.verify_jvm() ):
             return        
-        self.verify_duccling(True)
+        self.verify_duccling()
         self.verify_limits()
 
         memory = int(memory) * 1024 * 1024    # to GB from KB
@@ -359,7 +359,7 @@ class StartSim(DuccUtil):
             return  
 
         self.set_duccling_version()
-        self.verify_duccling(True)
+        self.verify_duccling()
 
         if ( os.path.exists('sim.pids') ):
             self.pids.load('sim.pids')