[Bigdata-commit] SF.net SVN: bigdata:[7480] branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src /test/com/bigdata/journal/jini/ha

[<tho...@us...>]

Revision: 7480
          http://bigdata.svn.sourceforge.net/bigdata/?rev=7480&view=rev
Author:   thompsonbry
Date:     2013-10-24 20:34:58 +0000 (Thu, 24 Oct 2013)
Log Message:
-----------
I have disabled the unit tests that stop and restart the zookeeper service.  We can investigate re-enabling these tests based on our updated understanding of the zookeeper semantics. However, another way to approach this (and one which may make more sense) is to run a highly available zookeeper ensemble and then investigate how the bigdata HA replication cluster handles the transient zk client changes as we stop and start various zk servers, forcing the zk clients to rollover to different zk servers in the ensemble.

See #718 (zk disconnect handling)
See #724 (wire pull and sudden kill testing).

Modified Paths:
--------------
    branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
    branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java

Modified: branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java
===================================================================
--- branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java	2013-10-24 20:25:13 UTC (rev 7479)
+++ branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestAll.java	2013-10-24 20:34:58 UTC (rev 7480)
@@ -114,7 +114,7 @@
         suite.addTestSuite(TestHA3DumpLogs.class);
 
         // Verify ability to override the HAJournal implementation class.
-//        suite.addTestSuite(TestHAJournalServerOverride.class); FIXME RESTORE OVERRIDE TEST SUITE!
+        suite.addTestSuite(TestHAJournalServerOverride.class); 
 
         // Test suite of longer running stress tests for an HA3 cluster.
         suite.addTestSuite(StressTestHA3JournalServer.class);

Modified: branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java
===================================================================
--- branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java	2013-10-24 20:25:13 UTC (rev 7479)
+++ branches/ZK_DISCONNECT_HANDLING/bigdata-jini/src/test/com/bigdata/journal/jini/ha/TestHAJournalServerOverride.java	2013-10-24 20:34:58 UTC (rev 7480)
@@ -893,47 +893,54 @@
 //        
 //    }
 
-    public void testStartAB_StopStartZookeeper() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperA() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperB() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperC() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperD() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperE() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperF() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
-
-    public void testStartAB_StopStartZookeeperG() throws Exception {
-
-        doStartAB_StopStartZookeeper();
-    }
+    /*
+     * FIXME Consider re-enabling these tests. Do we want to attempt to
+     * programmatically stop and start the zookeeper ensemble under test
+     * control?  For true HA deployments, what would be much more interesting
+     * is to run an ensemble with 3 zk servers and then do failovers of the
+     * zk servers and see how that effects the HAJournalServer instances.
+     */
+//    public void testStartAB_StopStartZookeeper() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperA() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperB() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperC() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperD() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperE() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperF() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
+//
+//    public void testStartAB_StopStartZookeeperG() throws Exception {
+//
+//        doStartAB_StopStartZookeeper();
+//    }
     
-    public void doStartAB_StopStartZookeeper() throws Exception {
+    private void doStartAB_StopStartZookeeper() throws Exception {
         
         final HAGlue serverA = startA();
         final HAGlue serverB = startB();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.