You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by fp...@apache.org on 2013/05/11 14:51:25 UTC

svn commit: r1481317 - in /zookeeper/trunk: CHANGES.txt src/java/test/org/apache/zookeeper/test/FLETest.java

Author: fpj
Date: Sat May 11 12:51:25 2013
New Revision: 1481317

URL: http://svn.apache.org/r1481317
Log:
ZOOKEEPER-1700. FLETest consistently failing - setLastSeenQuorumVerifier 
  seems to be hanging (phunt via fpj)


Modified:
    zookeeper/trunk/CHANGES.txt
    zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java

Modified: zookeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/trunk/CHANGES.txt?rev=1481317&r1=1481316&r2=1481317&view=diff
==============================================================================
--- zookeeper/trunk/CHANGES.txt (original)
+++ zookeeper/trunk/CHANGES.txt Sat May 11 12:51:25 2013
@@ -342,6 +342,9 @@ BUGFIXES:
   ZOOKEEPER-1672. zookeeper client does not accept "-members" option
   in reconfig command (Xiaoshuang Wang via phunt)
 
+  ZOOKEEPER-1700. FLETest consistently failing - setLastSeenQuorumVerifier
+  seems to be hanging (phunt via fpj)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-1170. Fix compiler (eclipse) warnings: unused imports,

Modified: zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java
URL: http://svn.apache.org/viewvc/zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java?rev=1481317&r1=1481316&r2=1481317&view=diff
==============================================================================
--- zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java (original)
+++ zookeeper/trunk/src/java/test/org/apache/zookeeper/test/FLETest.java Sat May 11 12:51:25 2013
@@ -202,7 +202,7 @@ public class FLETest extends ZKTestCase 
                                  * joined.
                                  */
                                 successCount++;
-                                notify();
+                                self.notify();
                             }
                         
                             /*
@@ -301,8 +301,9 @@ public class FLETest extends ZKTestCase 
             port[i] = PortAssignment.unique();
             peers.put(Long.valueOf(i),
                     new QuorumServer(i,
-                            new InetSocketAddress(PortAssignment.unique()),
-                    new InetSocketAddress(PortAssignment.unique()), new InetSocketAddress(port[i])));
+                            new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+                    new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+                    new InetSocketAddress("127.0.0.1", port[i])));
             tmpdir[i] = ClientBase.createTmpDir();           
         }
 
@@ -403,9 +404,9 @@ public class FLETest extends ZKTestCase 
             port[sid] = PortAssignment.unique();
             peers.put(Long.valueOf(sid),
                     new QuorumServer(sid,
-                            new InetSocketAddress(PortAssignment.unique()),
-                    new InetSocketAddress(PortAssignment.unique()),
-                    new InetSocketAddress(port[sid])));
+                            new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+                    new InetSocketAddress("127.0.0.1", PortAssignment.unique()),
+                    new InetSocketAddress("127.0.0.1", port[sid])));
             tmpdir[sid] = ClientBase.createTmpDir();          
         }
         // start 2 peers and verify if they form the cluster