svn commit: r1678102 - /uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java
Author: burn Date: Wed May 6 21:44:29 2015 New Revision: 1678102 URL: http://svn.apache.org/r1678102 Log: UIMA-4359 The JD should not replace the user's log4j setting Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java?rev=1678102&r1=1678101&r2=1678102&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-orchestrator/src/main/java/org/apache/uima/ducc/orchestrator/factory/JobFactory.java Wed May 6 21:44:29 2015 @@ -347,8 +347,7 @@ public class JobFactory implements IJobF flagName = FlagsHelper.Name.UserErrorHandlerCfg; flagValue = jobRequestProperties.getProperty(JobSpecificationProperties.key_driver_exception_handler_arguments); addDashD(jcl, flagName, flagValue); - // Name the log config file explicitly - the default of searching the user-provided classpath is dangerous - jcl.addOption("-Dlog4j.configuration=file://" + Utils.findDuccHome() + "/resources/log4j.xml"); + // No longer replace user's value by explicitly setting -Dlog4j.configuration ... DuccLogger knows how to find it // Log directory jcl.setLogDirectory(jobRequestProperties.getProperty(JobSpecificationProperties.key_log_directory)); return jcl;
svn commit: r1678061 - /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java
Author: burn Date: Wed May 6 18:55:06 2015 New Revision: 1678061 URL: http://svn.apache.org/r1678061 Log: UIMA-4372 For cancel_on_interrupt need to accept the --reason option Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java?rev=1678061&r1=1678060&r2=1678061&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccReservationCancel.java Wed May 6 18:55:06 2015 @@ -43,7 +43,8 @@ public class DuccReservationCancel UiOption.Help, UiOption.Debug, -UiOption.JobId, +UiOption.ReservationId, +UiOption.Reason, UiOption.RoleAdministrator, }; @@ -103,7 +104,7 @@ public class DuccReservationCancel try { cancelReservationReplyDuccEvent = (CancelReservationReplyDuccEvent) dispatcher.dispatchAndWaitForDuccReply(cancelReservationDuccEvent); } catch (Exception e) { -message("Job not submitted:", e.getMessage()); +message("Cancel not submitted:", e.getMessage()); return false; } finally { dispatcher.close();
svn commit: r1678049 - in /uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima: cas/impl/ cas/text/ internal/util/
Author: schor Date: Wed May 6 17:45:59 2015 New Revision: 1678049 URL: http://svn.apache.org/r1678049 Log: [UIMA-4381] speed up concurrent mod checking for flat iterators Added: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/internal/util/Int2IntArrayMapFixedSize.java Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexFlat.java uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FeatureStructureImpl.java uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/Subiterator.java uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/UnambiguousIteratorImpl.java uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/text/AnnotationIndex.java Modified: uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexFlat.java URL: http://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexFlat.java?rev=1678049&r1=1678048&r2=1678049&view=diff == --- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexFlat.java (original) +++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexFlat.java Wed May 6 17:45:59 2015 @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.Atomi import org.apache.uima.cas.FSIterator; import org.apache.uima.cas.FeatureStructure; import org.apache.uima.cas.impl.FSIndexRepositoryImpl.IndexIteratorCachePair; +import org.apache.uima.internal.util.Int2IntArrayMapFixedSize; import org.apache.uima.jcas.cas.TOP; /** @@ -105,7 +106,7 @@ public class FSIndexFlat extends FSIteratorImplBase { + public static class FSIteratorFlat extends FSIteratorImplBase implements LowLevelIterator { /** * iterator's Feature Structure array, points to the instance * in existence when the iterator was created, from the FSIndex @@ -158,7 +159,7 @@ public class FSIndexFlat iicp; - + /** * The flattened version of the above, or null * set under fsaLock @@ -352,7 +316,7 @@ public class FSIndexFlat iicp) { this.iicp = iicp; + indexUpdateCountsResetValues = iicp.createIndexUpdateCountsAtReset(); -//offset_indexUpdateCountsAtReset = new Int2IntHashMap(iicp.typeCodes.length); -//int i = 0; -//for (int typeCode : iicp.typeCodes) { -// offset_indexUpdateCountsAtReset.put(typeCode, i++); -//} debugTypeCode = iicp.getFsLeafIndex().getTypeCode(); casResetCount = iicp.getCASImpl().getCasResets(); casId = iicp.getCASImpl().getCasId(); @@ -524,7 +484,7 @@ public class FSIndexFlathttp://svn.apache.org/viewvc/uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java?rev=1678049&r1=1678048&r2=1678049&view=diff == --- uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java (original) +++ uima/uimaj/trunk/uimaj-core/src/main/java/org/apache/uima/cas/impl/FSIndexRepositoryImpl.java Wed May 6 17:45:59 2015 @@ -20,6 +20,7 @@ package org.apache.uima.cas.impl; import java.util.ArrayList; +import java.util.Arrays; import java.util.BitSet; import java.util.Collections; import java.util.Comparator; @@ -48,6 +49,7 @@ import org.apache.uima.cas.admin.LinearT import org.apache.uima.cas.impl.FSIndexFlat.FSIteratorFlat; import org.apache.uima.cas.text.AnnotationFS; import org.apache.uima.internal.util.ComparableIntPointerIterator; +import org.apache.uima.internal.util.Int2IntArrayMapFixedSize; import org.apache.uima.internal.util.IntComparator; import org.apache.uima.internal.util.IntPointerIterator; import org.apache.uima.internal.util.IntVector; @@ -225,7 +227,7 @@ public class FSIndexRepositoryImpl imple /** * The type codes corresponding to the cachedSubFsLeafIndexes, set up lazily */ -int[] typeCodes; +int[] sortedTypeCodes; @Override public String toString() { @@ -306,7 +308,7 @@ public class FSIndexRepositoryImpl imple final ArrayList> tempSubIndexCache = new ArrayList>(); final int len = allTypes.size(); if (indexKind == FSIndex.SORTED_INDEX) { - typeCodes = new int[len]; + sortedTypeCodes = new int[len]; } for (int i = 0; i < len; i++) { @@ -320,11 +322,12 @@ public class FSIndexRepositoryImpl imple throw new RuntimeException("never happen"); } if (indexKind == FSIndex.SORTED_INDEX) { -typeCodes[i] = leafIndex.getTypeCode(); +sortedTypeCodes[i] = leafIndex.getTypeCode(); } } this.cachedSubFsLeafIndexes = tempSubIndexCache; if (this.fsLeafIndex.getIndexingStrategy() == FSIndex.SORTED_I
svn commit: r1677988 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts: runducc start_sim
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')
svn commit: r1677982 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs: 1.job 2.job 3.job 4.job 5.job 6.job
Author: degenaro Date: Wed May 6 13:16:28 2015 New Revision: 1677982 URL: http://svn.apache.org/r1677982 Log: UIMA-4335 DUCC Apache Live Demo init time spec is now in millis Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/1.job uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/2.job uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/3.job uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/4.job uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/5.job uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/6.job Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/1.job URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/1.job?rev=1677982&r1=1677981&r2=1677982&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/1.job (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/1.job Wed May 6 13:16:28 2015 @@ -26,5 +26,5 @@ process_descriptor_AE org.apach classpath ${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/* process_jvm_args -Xmx100M process_per_item_time_max 12 -environmentAE_INIT_TIME=90 AE_INIT_RANGE=30 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path +environmentAE_INIT_TIME=9 AE_INIT_RANGE=3 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path process_deployments_max999 Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/2.job URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/2.job?rev=1677982&r1=1677981&r2=1677982&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/2.job (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/2.job Wed May 6 13:16:28 2015 @@ -26,5 +26,5 @@ process_descriptor_AE org.apach classpath ${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/* process_jvm_args -Xmx100M process_per_item_time_max 12 -environmentAE_INIT_TIME=90 AE_INIT_RANGE=30 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path +environmentAE_INIT_TIME=9 AE_INIT_RANGE=3 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path process_deployments_max999 Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/3.job URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/3.job?rev=1677982&r1=1677981&r2=1677982&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/3.job (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/3.job Wed May 6 13:16:28 2015 @@ -26,5 +26,5 @@ process_descriptor_AE org.apach classpath ${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/* process_jvm_args -Xmx100M process_per_item_time_max 12 -environmentAE_INIT_TIME=90 AE_INIT_RANGE=30 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path +environmentAE_INIT_TIME=9 AE_INIT_RANGE=3 INIT_ERROR=0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path process_deployments_max999 Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/4.job URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/4.job?rev=1677982&r1=1677981&r2=1677982&view=diff == --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/4.job (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/uima-ducc-vm/jobs/4.job Wed May 6 13:16:28 2015 @@ -26,5 +26,5 @@ process_descriptor_AE org.apach classpath ${DUCC_HOME}/lib/uima-ducc/examples/*:${DUCC_HOME}/apache-uima/lib/* process_jvm_args -Xmx100M process_per_item_time_max 12 -environmentAE_INIT_TIME=90 AE_INIT_RANGE=30 AE_RUNTIME_ERROR=5.0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path +environmentAE_INIT_TIME=9 AE_INIT_RANGE=3 AE_RUNTIME_ERROR=5.0 LD_LIBRARY_PATH=/yet/a/nother/dumb/path process_deployments_max999 Modified: uima/sandbox/uima-ducc/trunk