You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ca...@apache.org on 2011/09/22 16:47:01 UTC
svn commit: r1174171 - in /zookeeper/branches/branch-3.3: ./
src/java/test/org/apache/zookeeper/test/
Author: camille
Date: Thu Sep 22 14:47:00 2011
New Revision: 1174171
URL: http://svn.apache.org/viewvc?rev=1174171&view=rev
Log:
ZOOKEEPER-1160. test timeouts are too small (breed via camille)
Modified:
zookeeper/branches/branch-3.3/CHANGES.txt
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLERestartTest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLETest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java
zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/LETest.java
Modified: zookeeper/branches/branch-3.3/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/CHANGES.txt?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.3/CHANGES.txt Thu Sep 22 14:47:00 2011
@@ -19,6 +19,8 @@ BUGFIXES:
ZOOKEEPER-961. Watch recovery after disconnection when connection string contains a prefix.
(Matthias Spycher via mahadev)
+
+ ZOOKEEPER-1160. test timeouts are too small (breed via camille)
Release 3.3.3 - 2011-02-23
Backward compatible changes:
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/CnxManagerTest.java Thu Sep 22 14:47:00 2011
@@ -111,7 +111,7 @@ public class CnxManagerTest extends Test
public void run(){
try {
- QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[0], peerTmpdir[0], peerClientPort[0], 3, 0, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[0], peerTmpdir[0], peerClientPort[0], 3, 0, 1000, 2, 2);
QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
@@ -155,7 +155,7 @@ public class CnxManagerTest extends Test
thread.start();
- QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
@@ -199,7 +199,7 @@ public class CnxManagerTest extends Test
new InetSocketAddress(deadAddress, PortAssignment.unique())));
peerTmpdir[2] = ClientBase.createTmpDir();
- QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
@@ -226,7 +226,7 @@ public class CnxManagerTest extends Test
*/
@Test
public void testCnxManagerSpinLock() throws Exception {
- QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, peerTmpdir[1], peerTmpdir[1], peerClientPort[1], 3, 1, 1000, 2, 2);
QuorumCnxManager cnxManager = new QuorumCnxManager(peer);
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLELostMessageTest.java Thu Sep 22 14:47:00 2011
@@ -142,7 +142,7 @@ public class FLELostMessageTest extends
* Start server 0
*/
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[1], tmpdir[1], port[1], 3, 1, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[1], tmpdir[1], port[1], 3, 1, 1000, 2, 2);
peer.startLeaderElection();
LEThread thread = new LEThread(peer, 1);
thread.start();
@@ -178,7 +178,7 @@ public class FLELostMessageTest extends
/*
* Create an instance of the connection manager
*/
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 1000, 2, 2);
cnxManager = new QuorumCnxManager(peer);
QuorumCnxManager.Listener listener = cnxManager.listener;
if(listener != null){
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLENewEpochTest.java Thu Sep 22 14:47:00 2011
@@ -165,7 +165,7 @@ public class FLENewEpochTest extends Tes
}
for(int i = 1; i < le.length; i++) {
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 1000, 2, 2);
peer.startLeaderElection();
LEThread thread = new LEThread(peer, i);
thread.start();
@@ -174,7 +174,7 @@ public class FLENewEpochTest extends Tes
if(!start0.tryAcquire(4000, java.util.concurrent.TimeUnit.MILLISECONDS))
fail("First leader election failed");
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[0], tmpdir[0], port[0], 3, 0, 1000, 2, 2);
peer.startLeaderElection();
LEThread thread = new LEThread(peer, 0);
thread.start();
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLERestartTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLERestartTest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLERestartTest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLERestartTest.java Thu Sep 22 14:47:00 2011
@@ -136,7 +136,7 @@ public class FLERestartTest extends Test
QuorumBase.shutdown(peer);
((FastLeaderElection) restartThreads.get(i).peer.getElectionAlg()).shutdown();
- peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 2, 2, 2);
+ peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 1000, 2, 2);
peer.startLeaderElection();
peerRound++;
} else {
@@ -186,7 +186,7 @@ public class FLERestartTest extends Test
}
for(int i = 0; i < count; i++) {
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 2, 2, 2);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 1000, 2, 2);
peer.startLeaderElection();
FLERestartThread thread = new FLERestartThread(peer, i);
thread.start();
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLETest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLETest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLETest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLETest.java Thu Sep 22 14:47:00 2011
@@ -273,7 +273,7 @@ public class FLETest extends TestCase {
for(int i = 0; i < le.length; i++) {
QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i],
- port[i], 3, i, 2, 2, 2);
+ port[i], 3, i, 1000, 2, 2);
peer.startLeaderElection();
LEThread thread = new LEThread(peer, i);
thread.start();
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/FLEZeroWeightTest.java Thu Sep 22 14:47:00 2011
@@ -163,7 +163,7 @@ public class FLEZeroWeightTest extends T
for(int i = 0; i < le.length; i++) {
QuorumHierarchical hq = new QuorumHierarchical(qp);
- QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 2, 2, 2, hq);
+ QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i], port[i], 3, i, 1000, 2, 2, hq);
peer.startLeaderElection();
LEThread thread = new LEThread(peer, i);
thread.start();
Modified: zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/LETest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/LETest.java?rev=1174171&r1=1174170&r2=1174171&view=diff
==============================================================================
--- zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/LETest.java (original)
+++ zookeeper/branches/branch-3.3/src/java/test/org/apache/zookeeper/test/LETest.java Thu Sep 22 14:47:00 2011
@@ -105,7 +105,7 @@ public class LETest extends TestCase {
boolean allowOneBadLeader = leaderDies;
for(int i = 0; i < le.length; i++) {
QuorumPeer peer = new QuorumPeer(peers, tmpdir[i], tmpdir[i],
- port[i], 0, i, 2, 2, 2);
+ port[i], 0, i, 1000, 2, 2);
peer.startLeaderElection();
le[i] = new LeaderElection(peer);
LEThread thread = new LEThread(le[i], peer, i);