Author: challngr Date: Tue Jun 16 17:52:32 2015 New Revision: 1685880 URL: http://svn.apache.org/r1685880 Log: UIMA-4358 Cleanup tests - remove no-longer-used logging. Correct help text in runducc.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/scripts/runducc Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java?rev=1685880&r1=1685879&r2=1685880&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepAE.java Tue Jun 16 17:52:32 2015 @@ -21,7 +21,6 @@ package org.apache.uima.ducc.test.random import java.io.File; import java.io.FileNotFoundException; -import java.io.IOException; import java.io.PrintWriter; import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; @@ -51,7 +50,6 @@ public class FixedSleepAE extends CasAnn Random r; Logger logger; static boolean initComplete = false; - Marker marker; String AE_Identifier = "*^^^^^^^^^ AE "; ArrayList< long[] > bloated_space = new ArrayList< long[] >(); @@ -91,34 +89,6 @@ public class FixedSleepAE extends CasAnn } } - if ( System.getenv( "FAST_INIT_FAIL" ) != null ) { - // we want just enough init to get at least one process into RUNNING state, but all - // subsequent initializations to fail under this scenario. - String jobid = System.getProperty("ducc.job.id"); - String wd = System.getProperty("user.dir"); - String markerdir = wd + "/" + jobid + ".output"; - System.out.println("LOOK IN " + markerdir); - File marker = new File(markerdir); - - String[] outputs = marker.list(); - int count = 0; - for ( String s : outputs) { - if ( s.endsWith(".die") ) count++; - System.out.println("COUNT " + s + " count = " + count); - if ( count > 2 ) { - throw new IllegalStateException("foo foo and foo"); - } - } - File init_death = new File(markerdir + "/" + tid + ".die"); - System.out.println("CREATE " + init_death); - try { - init_death.createNewFile(); - } catch (IOException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } - } - long sleep; if ( !initComplete ) { // longer init only the first tim initComplete = true; @@ -342,9 +312,6 @@ public class FixedSleepAE extends CasAnn String s = sb.toString(); System.out.println("FROM PRINTLN: " + s); logger.log(Level.INFO, "FROM LOGGER:" + s); - if ( marker != null ) { - marker.write(s); - } } public void destroy() @@ -355,11 +322,6 @@ public class FixedSleepAE extends CasAnn Thread.sleep(3000); // simulate actual work being done here } catch (InterruptedException e) { } - // check if process() has been called. If not, marker is still null - if ( marker != null ) { - marker.flush(); - marker.close(); - } System.out.println(AE_Identifier + " Destroy exits"); } @@ -398,14 +360,6 @@ public class FixedSleepAE extends CasAnn System.exit(1); } - if ( marker == null) { - if (!logid.equals("None") ) { - marker = new Marker(logid, pid, tid); - } - } else { - marker.flush(); - } - try{ dolog(msgheader + " sleeping " + elapsed + " MS."); String bloat = System.getenv("PROCESS_BLOAT"); @@ -434,6 +388,9 @@ public class FixedSleepAE extends CasAnn } + // + // Not used any more. Kept in src in case we want to resurrect it. + // class Marker { PrintWriter writer = null; Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java?rev=1685880&r1=1685879&r2=1685880&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-examples/src/main/java/org/apache/uima/ducc/test/randomsleep/FixedSleepCR.java Tue Jun 16 17:52:32 2015 @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; -import java.io.PrintStream; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -63,7 +62,6 @@ public class FixedSleepCR extends Collec private volatile int index = 0; private volatile String logdir = "None"; private volatile String jobid; - PrintStream jdmark; double error_rate; double exit_rate; @@ -158,22 +156,6 @@ public class FixedSleepCR extends Collec logger.log(Level.INFO, " ****** Adding work item of duration " + elapsed + " ms compressed to " + compressed + " ms as work item " + ndx++); } - File f = new File(logdir); - if ( f.mkdirs() ) { - String jdmarker = logdir + "/jd.marker"; - try { - jdmark = new PrintStream(jdmarker); - jdmark.println("" + System.currentTimeMillis() + " " + jobid + " " + jobfile + " " + workitems.size() + " work items."); - logger.log(Level.INFO, "Created jdmarker file: " + jdmarker); - } catch (FileNotFoundException e) { - logger.log(Level.INFO, " !!!!!! Can't open file: " + jdmarker + ". user.dir = ", System.getProperty("user.dir")); - } - - }else { - logger.log(Level.INFO, " !!!!!! Can't create log directory " + f.toString() ); - logdir = "None"; - } - } int getIntFromEnv(String key, boolean fail) @@ -339,10 +321,6 @@ public class FixedSleepCR extends Collec logger.log(Level.INFO, msgheader + workitems.get(index) + " getNext invocation " + get_next_counter++); String parm = "" + workitems.get(index) + " " + (index+1) + " " + workitems.size() + " " + logdir; - if ( jdmark != null ) { - jdmark.println("" + System.currentTimeMillis() + " " + parm); - } - randomError(error_rate, msgheader, false); randomError(exit_rate, msgheader, false); runBloater(bloat, msgheader); @@ -357,21 +335,12 @@ public class FixedSleepCR extends Collec public void destroy() { logger.log(Level.INFO, "destroy"); - if ( jdmark != null ) { - jdmark.println("" + System.currentTimeMillis() + " " + jobid + " JD is destroyed"); - jdmark.close(); - } } public void close() throws IOException { - logger.log(Level.INFO, "close"); - if ( jdmark != null ) { - jdmark.println("" + System.currentTimeMillis() + " " + jobid + " JD is closed"); - jdmark.close(); - } - + logger.log(Level.INFO, "close"); } @@ -389,14 +358,7 @@ public class FixedSleepCR extends Collec logger.log(Level.INFO, "hasNext"); boolean answer = (index < workitems.size()); if ( ! answer ) { - if ( jdmark == null ) { - logger.log(Level.INFO, "ALERT jdmarker is null and should not be. Bypassing final closing message."); - } else { - jdmark.println("" + System.currentTimeMillis() + " " + jobid + " No more work, hasNext returns " + answer); - jdmark.close(); - jdmark = null; - logger.log(Level.INFO, "getNext() returns false, JDMARKER is closed."); - } + logger.log(Level.INFO, "" + System.currentTimeMillis() + " " + jobid + " No more work, hasNext returns " + answer); } return answer; } 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=1685880&r1=1685879&r2=1685880&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 Tue Jun 16 17:52:32 2015 @@ -575,7 +575,7 @@ class RunDucc(DuccUtil): print ' If specified, we run verification against the results.' print '' print ' -p, --process_timeout sec' - print ' Process timeout, in seconds. Default:', self.process_timeout + print ' Process timeout, in minutes. Default:', self.process_timeout print '' print ' --jd_uima_log log-properties' print ' If specified, use the indicated properties file for JD UIMA/UIMA-AS logging. Default:', self.jd_uima_log