[Bigdata-commit] SF.net SVN: bigdata:[3800] branches/JOURNAL_HA_BRANCH/bigdata/src

[<mar...@us...>]

Revision: 3800
          http://bigdata.svn.sourceforge.net/bigdata/?rev=3800&view=rev
Author:   martyncutcher
Date:     2010-10-14 16:19:22 +0000 (Thu, 14 Oct 2010)

Log Message:
-----------
Fix abort to ensure rootBlocks kept in sync and adjust stressTestAbort to reduce count until RWStore reopen can be faster

Modified Paths:
--------------
    branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java
    branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAbort.java

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-10-14 14:41:34 UTC (rev 3799)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/java/com/bigdata/journal/RWStrategy.java	2010-10-14 16:19:22 UTC (rev 3800)
@@ -545,6 +545,8 @@
 	 * Calls through to store and then to WriteCacheService.reset
 	 */
 	public void abort() {
+		m_store.checkRootBlock(m_rb);
+		
 	    m_store.reset();
 	}
 	

Modified: branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAbort.java
===================================================================
--- branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAbort.java	2010-10-14 14:41:34 UTC (rev 3799)
+++ branches/JOURNAL_HA_BRANCH/bigdata/src/test/com/bigdata/journal/TestAbort.java	2010-10-14 16:19:22 UTC (rev 3800)
@@ -169,7 +169,6 @@
             // make sure the offset has not been changed.
             assertEquals(firstOffset, store.getRootBlockView()
                     .getNextOffset());
-
             // write some data onto the store.
             for (int i = 0; i < nrecs; i++) {
 
@@ -268,7 +267,6 @@
             // verify the write.
             assertEquals(new byte[] { 2, 4 }, ndx
                     .lookup(new byte[] { 1, 3 }));
-
         } finally {
 
             store.destroy();
@@ -283,10 +281,10 @@
      */
     public void test_stressTestAbort() {
 
-        final int LIMIT = 100;
+        final int LIMIT = 10; // temporary reduction while fix to RWStore reopen
+        					  // that currently takes too long
 
         for (int i = 0; i < LIMIT; i++) {
-
             test_abort();
 
         }


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