[Bigdata-commit] SF.net SVN: bigdata:[8116] branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/ com/bigdata/io/writecache

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

Revision: 8116
          http://sourceforge.net/p/bigdata/code/8116
Author:   thompsonbry
Date:     2014-04-14 12:41:29 +0000 (Mon, 14 Apr 2014)
Log Message:
-----------
Fix for the HA1 tests in the write cache service test suite.

Modified Paths:
--------------
    branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
    branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java	2014-04-14 09:59:13 UTC (rev 8115)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestRWWriteCacheService.java	2014-04-14 12:41:29 UTC (rev 8116)
@@ -35,6 +35,7 @@
 import java.util.HashMap;
 import java.util.Map.Entry;
 import java.util.Random;
+import java.util.concurrent.TimeUnit;
 
 import junit.framework.AssertionFailedError;
 
@@ -48,7 +49,6 @@
 import com.bigdata.quorum.QuorumActor;
 import com.bigdata.rwstore.RWWriteCacheService;
 import com.bigdata.util.ChecksumUtility;
-import com.bigdata.util.InnerCause;
 
 /**
  * Test suite for the {@link WriteCacheService} using scattered writes on a
@@ -138,6 +138,19 @@
         actor.castVote(0);
         fixture.awaitDeque();
 
+        // Await quorum meet.
+        assertCondition(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    assertEquals(0L, quorum.token());
+                } catch (Exception e) {
+                    fail();
+                }
+            }
+
+        }, 5000/*timeout*/, TimeUnit.MILLISECONDS);
+
         file = File.createTempFile(getName(), ".rw.tmp");
 
         opener = new ReopenFileChannel(file, "rw");

Modified: branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java
===================================================================
--- branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java	2014-04-14 09:59:13 UTC (rev 8115)
+++ branches/BIGDATA_MGC_HA1_HA5/bigdata/src/test/com/bigdata/io/writecache/TestWORMWriteCacheService.java	2014-04-14 12:41:29 UTC (rev 8116)
@@ -521,7 +521,7 @@
 
         final int nbuffers = 1;
         final boolean useChecksums = false;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true; // for HA1! false;
 
         // No write pipeline.
         final int k = 1;
@@ -574,7 +574,7 @@
          */
         final double largeRecordRate = 0d;
         final boolean useChecksums = false;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true;
 
         final int k = 1;
         final long lastCommitTime = 0L;
@@ -619,7 +619,7 @@
 
         final int nbuffers = 2;
         final boolean useChecksums = false;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true; // for HA1! false;
 
         // No write pipeline.
         final int k = 1;
@@ -672,7 +672,7 @@
          */
         final double largeRecordRate = 0d;
         final boolean useChecksums = false;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true; // for HA1! false;
 
         // No write pipeline.
         final int k = 1;
@@ -681,8 +681,7 @@
         final String logicalServiceId = "logicalService_"+getName();
         final MockQuorum<HAPipelineGlue, MyMockQuorumMember<HAPipelineGlue>> quorum = new MockQuorum<HAPipelineGlue, MyMockQuorumMember<HAPipelineGlue>>(
                 k, fixture);
-        try {
-            
+        try {            
             fixture.start();
             quorum.start(new MyMockQuorumMember<HAPipelineGlue>(fixture,logicalServiceId));
 
@@ -718,7 +717,7 @@
 
         final int nbuffers = 6;
         final boolean useChecksums = true;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true; // for HA1! false;
 
         // No write pipeline.
         final int k = 1;
@@ -771,7 +770,7 @@
          */
         final double largeRecordRate = 0d;
         final boolean useChecksums = true;
-        final boolean isHighlyAvailable = false;
+        final boolean isHighlyAvailable = true; // for HA1! false;
 
         // No write pipeline.
         final int k = 1;
@@ -2120,6 +2119,19 @@
                     + ", isHighlyAvailable=" + isHighlyAvailable);
         }
         
+        // Await quorum meet.
+        assertCondition(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    assertEquals(0L, quorum.token());
+                } catch (Exception e) {
+                    fail();
+                }
+            }
+
+        }, 5000/*timeout*/, TimeUnit.MILLISECONDS);
+
         File file = null;
         ReopenFileChannel opener = null;
         WriteCacheService writeCacheService = null;

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