Author: fpj
Date: Wed Jan 11 14:46:29 2012
New Revision: 1230070
URL: http://svn.apache.org/viewvc?rev=1230070&view=rev
Log:
BOOKKEEPER-148: Jenkins build is failing (ivank via fpj)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1230070&r1=1230069&r2=1230070&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Jan 11 14:46:29 2012
@@ -16,6 +16,8 @@ Trunk (unreleased changes)
BOOKKEEPER-141: Run extracting ledger id from entry log files in GC thread to speed
up bookie restart (Sijie Gou via ivank)
+ BOOKKEEPER-148: Jenkins build is failing (ivank via fpj)
+
hedwig-server/
BOOKKEEPER-140: Hub server doesn't subscribe remote region correctly when a region
is down. (Sijie Gou via ivank)
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml?rev=1230070&r1=1230069&r2=1230070&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/pom.xml Wed Jan 11 14:46:29 2012
@@ -109,12 +109,13 @@
<build>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <forkMode>pertest</forkMode>
- </configuration>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
+ <configuration>
+ <argLine>-Xmx1G</argLine>
+ <forkMode>pertest</forkMode>
+ </configuration>
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
@@ -130,14 +131,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <argLine>-Xmx1G</argLine>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java?rev=1230070&r1=1230069&r2=1230070&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
(original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/client/TestFencing.java
Wed Jan 11 14:46:29 2012
@@ -162,8 +162,10 @@ public class TestFencing extends BaseTes
*/
final LedgerHandle writelh = bkc.createLedger(digestType, "".getBytes());
+ final int numRecovery = 10;
+
final String tmp = "BookKeeper is cool!";
- final CountDownLatch latch = new CountDownLatch(100);
+ final CountDownLatch latch = new CountDownLatch(numRecovery);
Thread writethread = new Thread() {
public void run() {
try {
@@ -178,7 +180,7 @@ public class TestFencing extends BaseTes
};
writethread.start();
- final int numRecovery = 100;
+
CyclicBarrier barrier = new CyclicBarrier(numRecovery+1);
LedgerOpenThread threads[] = new LedgerOpenThread[numRecovery];
for (int i = 0; i < numRecovery; i++) {
|