Tests all pass.

jdebrabant · Apr 18, 2014 · c3f469f · c3f469f
1 parent 59579e6
commit c3f469f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/src/frontend/org/voltdb/AriesLogNative.java b/src/frontend/org/voltdb/AriesLogNative.java
@@ -70,9 +70,9 @@ public AriesLogNative(int numSites, int numPartitionsPerSite, int size, String l
 	}
 
 	public AriesLogNative(int numSites, int numPartitionsPerSite, int size, int syncFrequency, String logFileName) {	    
-        LOG.warn("AriesLogNative : numSites : "+numSites+ " logFileName : "+logFileName);
+                //LOG.warn("AriesLogNative : numSites : "+numSites+ " logFileName : "+logFileName);
 
-	    m_perSiteRecoveryDone = new boolean[numSites*numPartitionsPerSite];
+	        m_perSiteRecoveryDone = new boolean[numSites*numPartitionsPerSite];
 
 		for (int i = 0; i < numSites*numPartitionsPerSite; i++) {
 			m_perSiteRecoveryDone[i] = false;

diff --git a/src/frontend/org/voltdb/compiler/VoltCompiler.java b/src/frontend/org/voltdb/compiler/VoltCompiler.java
@@ -101,7 +101,6 @@
 import org.voltdb.sysprocs.Sleep;
 import org.voltdb.sysprocs.SnapshotDelete;
 import org.voltdb.sysprocs.SnapshotRestore;
-import org.voltdb.sysprocs.SnapshotRestoreLocal;
 import org.voltdb.sysprocs.SnapshotSave;
 import org.voltdb.sysprocs.SnapshotScan;
 import org.voltdb.sysprocs.SnapshotStatus;
@@ -1263,7 +1262,6 @@ void addSystemProcsToCatalog(final Catalog catalog, final Database database) thr
         // Table of sysproc metadata.
         final Object[][] procedures = {
             // SysProcedure Class                   readonly    everysite
-            //{SnapshotRestoreLocal.class,            false,      true},
             {LoadMultipartitionTable.class,         false,      true},
             {DatabaseDump.class,                    true,       true},
             {MarkovUpdate.class,                    true,       true},

diff --git a/tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java b/tests/frontend/org/voltdb/regressionsuites/TestTPCCPhysicalRecovery.java
@@ -54,7 +54,9 @@ public class TestTPCCPhysicalRecovery extends RegressionSuite {
 
     // TPCC
     private static final String PREFIX = "tpcc";
-    private static int NUM_TRANSACTIONS = 5000;
+    // XXX ARIES logger fsync's a lot - so reduced this to 10 txns
+    // Either change it to group commit or use PMFS which has lightweight fsync
+    private static int NUM_TRANSACTIONS = 10;
     private static final String projectJAR = "physical_" + PREFIX + ".jar";    
 
     public TestTPCCPhysicalRecovery(String name) {
@@ -192,10 +194,10 @@ static public Test suite() {
         // PHYSICAL
         builder.setGlobalConfParameter("site.aries", true);        
         builder.setGlobalConfParameter("site.aries_forward_only", false);     
-        builder.setGlobalConfParameter("site.aries_dir", "/mnt/pmfs/aries");     
-
         builder.setGlobalConfParameter("site.anticache_enable", false);     
 
+        //builder.setGlobalConfParameter("site.aries_dir", "/mnt/pmfs/aries");     
+
         TPCCProjectBuilder project = new TPCCProjectBuilder();
 
         project.addAllDefaults();

diff --git a/tests/frontend/org/voltdb/regressionsuites/TestYCSBPhysicalRecovery.java b/tests/frontend/org/voltdb/regressionsuites/TestYCSBPhysicalRecovery.java
@@ -64,7 +64,7 @@ public class TestYCSBPhysicalRecovery extends RegressionSuite {
 
     // YCSB
     private static final String PREFIX = "ycsb";
-    private static int NUM_TRANSACTIONS = 5000;
+    private static int NUM_TRANSACTIONS = 10000;
     private static final String projectJAR = "physical_" + PREFIX + ".jar";
 
     public TestYCSBPhysicalRecovery(String name) {