zookeeper-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iv...@apache.org
Subject svn commit: r1351366 - in /zookeeper/bookkeeper/branches/branch-4.1: ./ bookkeeper-benchmark/ bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/ bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/ hedwig-server/
Date Mon, 18 Jun 2012 14:48:02 GMT
Author: ivank
Date: Mon Jun 18 14:48:02 2012
New Revision: 1351366

URL: http://svn.apache.org/viewvc?rev=1351366&view=rev
Log:
BOOKKEEPER-289: mvn clean doesn't remove test output files (sijie via ivank)

Modified:
    zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt
    zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/pom.xml
    zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
    zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
    zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/pom.xml

Modified: zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt?rev=1351366&r1=1351365&r2=1351366&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt (original)
+++ zookeeper/bookkeeper/branches/branch-4.1/CHANGES.txt Mon Jun 18 14:48:02 2012
@@ -12,6 +12,8 @@ Release 4.1.1 - UNRELEASED
 
     IMPROVEMENTS:
 
+      BOOKKEEPER-289: mvn clean doesn't remove test output files (sijie via ivank)
+
 Release 4.1.0 - 2012-06-07
 
   Non-backward compatible changes:

Modified: zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/pom.xml?rev=1351366&r1=1351365&r2=1351366&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/pom.xml Mon Jun 18 14:48:02
2012
@@ -40,6 +40,16 @@
 	  <skipAssembly>true</skipAssembly>
         </configuration>
       </plugin>
+      <plugin>
+      	<groupId>org.apache.maven.plugins</groupId>
+	<artifactId>maven-surefire-plugin</artifactId>
+	<version>2.9</version>
+	<configuration>
+          <systemPropertyVariables>
+            <test.latency.file>target/latencyDump.dat</test.latency.file>
+          </systemPropertyVariables>
+	</configuration>
+      </plugin>
     </plugins>
   </build>
   <dependencies>

Modified: zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java?rev=1351366&r1=1351365&r2=1351366&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
(original)
+++ zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/main/java/org/apache/bookkeeper/benchmark/BenchThroughputLatency.java
Mon Jun 18 14:48:02 2012
@@ -242,6 +242,7 @@ public class BenchThroughputLatency impl
         options.addOption("sockettimeout", true, "Socket timeout for bookkeeper client. In
seconds. Default 5");
         options.addOption("skipwarmup", false, "Skip warm up, default false");
         options.addOption("sendlimit", true, "Max number of entries to send. Default 20000000");
+        options.addOption("latencyFile", true, "File to dump latencies. Default is latencyDump.dat");
         options.addOption("help", false, "This message");
 
         CommandLineParser parser = new PosixParser();
@@ -268,6 +269,8 @@ public class BenchThroughputLatency impl
         String coordinationZnode = cmd.getOptionValue("coordnode");
         final byte[] passwd = cmd.getOptionValue("password", "benchPasswd").getBytes();
 
+        String latencyFile = cmd.getOptionValue("latencyFile", "latencyDump.dat");
+
         Timer timeouter = new Timer();
         if (cmd.hasOption("timeout")) {
             final long timeout = Long.valueOf(cmd.getOptionValue("timeout", "360")) * 1000;
@@ -285,7 +288,8 @@ public class BenchThroughputLatency impl
                 ", quorum size: " + quorum +
                 ", throttle: " + throttle +
                 ", number of ledgers: " + ledgers +
-                ", zk servers: " + servers);
+                ", zk servers: " + servers +
+                ", latency file: " + latencyFile);
 
         long totalTime = runningTime*1000;
 
@@ -380,7 +384,7 @@ public class BenchThroughputLatency impl
         }
 
         // dump the latencies for later debugging (it will be sorted by entryid)
-        OutputStream fos = new BufferedOutputStream(new FileOutputStream("latencyDump.dat"));
+        OutputStream fos = new BufferedOutputStream(new FileOutputStream(latencyFile));
 
         for(Long l: latency) {
             fos.write((Long.toString(l)+"\t"+(l/1000000)+ "ms\n").getBytes());

Modified: zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java?rev=1351366&r1=1351365&r2=1351366&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
(original)
+++ zookeeper/bookkeeper/branches/branch-4.1/bookkeeper-benchmark/src/test/java/org/apache/bookkeeper/benchmark/TestBenchmark.java
Mon Jun 18 14:48:02 2012
@@ -114,11 +114,13 @@ public class TestBenchmark {
 
     @Test
     public void testThroughputLatency() throws Exception {
+        String latencyFile = System.getProperty("test.latency.file", "latencyDump.dat");
         BenchThroughputLatency.main(new String[] {
                 "--time", "10",
                 "--skipwarmup",
                 "--throttle", "1",
-                "--sendlimit", "10000"
+                "--sendlimit", "10000",
+                "--latencyFile", latencyFile
             });
     }
 
@@ -211,4 +213,4 @@ public class TestBenchmark {
         }
         Assert.assertFalse("Thread should be finished", t.isAlive());
     }
-}
\ No newline at end of file
+}

Modified: zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/pom.xml?rev=1351366&r1=1351365&r2=1351366&view=diff
==============================================================================
--- zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/pom.xml (original)
+++ zookeeper/bookkeeper/branches/branch-4.1/hedwig-server/pom.xml Mon Jun 18 14:48:02 2012
@@ -148,23 +148,11 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>removebuilddir</id>
-            <phase>clean</phase>
-            <configuration>
-              <tasks>
-                <delete dir="build" />
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
             <id>createbuilddir</id>
             <phase>generate-test-resources</phase>
             <configuration>
               <tasks>
-                <mkdir dir="build" />
+                <mkdir dir="target/zk_clientbase_build" />
               </tasks>
             </configuration>
             <goals>
@@ -193,6 +181,10 @@
 	<version>2.9</version>
 	<configuration>
 	  <argLine>-Xmx1G</argLine>
+          <systemPropertyVariables>
+            <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+            <build.test.dir>target/zk_clientbase_build</build.test.dir>
+          </systemPropertyVariables>
 	</configuration>
       </plugin>
     </plugins>



Mime
View raw message