svn commit: r1422174 - in /zookeeper/bookkeeper/trunk: CHANGES.txt bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java

[si...@apache.org]

Author: sijie
Date: Sat Dec 15 02:08:32 2012
New Revision: 1422174

URL: http://svn.apache.org/viewvc?rev=1422174&view=rev
Log:
BOOKKEEPER-512: BookieZkExpireTest fails periodically (ivank via sijie)

Modified:
    zookeeper/bookkeeper/trunk/CHANGES.txt
    zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java

Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1422174&r1=1422173&r2=1422174&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Sat Dec 15 02:08:32 2012
@@ -142,6 +142,8 @@ Trunk (unreleased changes)
 
         BOOKKEEPER-336: bookie readEntries is taking more time if the ensemble has failed bookie(s) (ivank)
 
+        BOOKKEEPER-512: BookieZkExpireTest fails periodically (ivank via sijie)
+
       hedwig-protocol:
 
         BOOKKEEPER-394: CompositeException message is not useful (Stu Hood via sijie)

Modified: zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java
URL: http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java?rev=1422174&r1=1422173&r2=1422174&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java (original)
+++ zookeeper/bookkeeper/trunk/bookkeeper-server/src/test/java/org/apache/bookkeeper/test/BookieZKExpireTest.java Sat Dec 15 02:08:32 2012
@@ -37,6 +37,9 @@ public class BookieZKExpireTest extends 
 
     public BookieZKExpireTest() {
         super(0);
+        // 6000 is minimum due to default tick time
+        baseConf.setZkTimeout(6000);
+        baseClientConf.setZkTimeout(6000);
     }
 
     @Test
@@ -62,7 +65,13 @@ public class BookieZKExpireTest extends 
             server = new BookieServer(conf);
             server.start();
 
-            Thread.sleep(10);
+            int secondsToWait = 5;
+            while (!server.isRunning()) {
+                Thread.sleep(1000);
+                if (secondsToWait-- <= 0) {
+                    fail("Bookie never started");
+                }
+            }
             Thread sendthread = null;
             threadCount = Thread.activeCount();
             threads = new Thread[threadCount*2];
@@ -77,11 +86,19 @@ public class BookieZKExpireTest extends 
             assertNotNull("Send thread not found", sendthread);
 
             sendthread.suspend();
-            Thread.sleep(2*10000);
+            Thread.sleep(2*conf.getZkTimeout());
             sendthread.resume();
 
             // allow watcher thread to run
-            Thread.sleep(3000);
+            secondsToWait = 20;
+            while (server.isBookieRunning()
+                   || server.isNioServerRunning()
+                   || server.isRunning()) {
+                Thread.sleep(1000);
+                if (secondsToWait-- <= 0) {
+                    break;
+                }
+            }
             assertFalse("Bookie should have shutdown on losing zk session", server.isBookieRunning());
             assertFalse("Nio Server should have shutdown on losing zk session", server.isNioServerRunning());
             assertFalse("Bookie Server should have shutdown on losing zk session", server.isRunning());