You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jm...@apache.org on 2012/08/09 23:52:23 UTC

svn commit: r1371503 - in /hbase/branches/0.92: CHANGES.txt src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java

Author: jmhsieh
Date: Thu Aug  9 21:52:23 2012
New Revision: 1371503

URL: http://svn.apache.org/viewvc?rev=1371503&view=rev
Log:
HBASE-6552 TestAcidGuarantees system test should flush more aggresively (Gregory Chanan)

Modified:
    hbase/branches/0.92/CHANGES.txt
    hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java

Modified: hbase/branches/0.92/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/CHANGES.txt?rev=1371503&r1=1371502&r2=1371503&view=diff
==============================================================================
--- hbase/branches/0.92/CHANGES.txt (original)
+++ hbase/branches/0.92/CHANGES.txt Thu Aug  9 21:52:23 2012
@@ -100,6 +100,7 @@ Release 0.92.2 - Unreleased
    HBASE-4470  ServerNotRunningException coming out of assignRootAndMeta kills the Master (Gregory Chanan) 
    HBASE-6460  hbck "-repairHoles" usage inconsistent with "-fixHdfsOrphans" (Jie Huang)
    HBASE-6507 [hbck] TestHBaseFsck ran into TableNotEnabledException
+   HBASE-6552 TestAcidGuarantees system test should flush more aggresively (Gregory Chanan)
 
   IMPROVEMENTS
    HBASE-5592  Make it easier to get a table from shell (Ben West)

Modified: hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java?rev=1371503&r1=1371502&r2=1371503&view=diff
==============================================================================
--- hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java (original)
+++ hbase/branches/0.92/src/test/java/org/apache/hadoop/hbase/TestAcidGuarantees.java Thu Aug  9 21:52:23 2012
@@ -30,6 +30,7 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.hbase.MultithreadedTestUtil.RepeatingTestThread;
 import org.apache.hadoop.hbase.MultithreadedTestUtil.TestContext;
 import org.apache.hadoop.hbase.client.Get;
+import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
@@ -240,15 +241,6 @@ public class TestAcidGuarantees implemen
       int numGetters,
       int numScanners,
       int numUniqueRows) throws Exception {
-      runTestAtomicity(millisToRun, numWriters, numGetters, numScanners,
-		       numUniqueRows, true);
-  }
-
-  public void runTestAtomicity(long millisToRun,
-      int numWriters,
-      int numGetters,
-      int numScanners,
-      int numUniqueRows, boolean useFlusher) throws Exception {
     createTableIfMissing();
     TestContext ctx = new TestContext(util.getConfiguration());
     
@@ -265,13 +257,12 @@ public class TestAcidGuarantees implemen
       ctx.addThread(writer);
     }
     // Add a flusher
-    if (useFlusher) {
-      ctx.addThread(new RepeatingTestThread(ctx) {
-        public void doAnAction() throws Exception {
-          util.flush();
-        }
-      });
-    }
+    ctx.addThread(new RepeatingTestThread(ctx) {
+      HBaseAdmin admin = new HBaseAdmin(util.getConfiguration());
+      public void doAnAction() throws Exception {
+        admin.flush(TABLE_NAME);
+      }
+    });
 
     List<AtomicGetReader> getters = Lists.newArrayList();
     for (int i = 0; i < numGetters; i++) {
@@ -359,8 +350,7 @@ public class TestAcidGuarantees implemen
     int numGetters = c.getInt("numGetters", 2);
     int numScanners = c.getInt("numScanners", 2);
     int numUniqueRows = c.getInt("numUniqueRows", 3);
-    // cannot run flusher in real cluster case.
-    runTestAtomicity(millis, numWriters, numGetters, numScanners, numUniqueRows, false);
+    runTestAtomicity(millis, numWriters, numGetters, numScanners, numUniqueRows);
     return 0;
   }