hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject svn commit: r1127377 - in /hbase/trunk: ./ src/main/java/org/apache/hadoop/hbase/regionserver/wal/ src/main/resources/ src/test/java/org/apache/hadoop/hbase/ src/test/java/org/apache/hadoop/hbase/coprocessor/ src/test/java/org/apache/hadoop/hbase/regio...
Date Wed, 25 May 2011 04:48:39 GMT
Author: stack
Date: Wed May 25 04:48:39 2011
New Revision: 1127377

URL: http://svn.apache.org/viewvc?rev=1127377&view=rev
Log:
HBASE-3920 HLog hbase.regionserver.flushlogentries no longer supported

Modified:
    hbase/trunk/CHANGES.txt
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
    hbase/trunk/src/main/resources/hbase-default.xml
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
    hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java

Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed May 25 04:48:39 2011
@@ -292,6 +292,8 @@ Release 0.90.4 - Unreleased
   IMPROVEMENT
    HBASE-3882  hbase-config.sh needs to be updated so it can auto-detects the
                sun jre provided by RHEL6 (Roman Shaposhnik)
+   HBASE-3920  HLog hbase.regionserver.flushlogentries no longer supported
+               (Dave Latham)
 
 Release 0.90.3 - May 19th, 2011
 

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Wed May 25
04:48:39 2011
@@ -125,7 +125,6 @@ public class HLog implements Syncable {
     new CopyOnWriteArrayList<WALObserver>();
   private final long optionalFlushInterval;
   private final long blocksize;
-  private final int flushlogentries;
   private final String prefix;
   private final Path oldLogDir;
   private boolean logRollRequested;
@@ -336,8 +335,6 @@ public class HLog implements Syncable {
         registerWALActionsListener(i);
       }
     }
-    this.flushlogentries =
-      conf.getInt("hbase.regionserver.flushlogentries", 1);
     this.blocksize = conf.getLong("hbase.regionserver.hlog.blocksize",
       this.fs.getDefaultBlockSize());
     // Roll at 95% of block size.
@@ -363,7 +360,6 @@ public class HLog implements Syncable {
       StringUtils.byteDesc(this.blocksize) +
       ", rollsize=" + StringUtils.byteDesc(this.logrollsize) +
       ", enabled=" + this.enabled +
-      ", flushlogentries=" + this.flushlogentries +
       ", optionallogflushinternal=" + this.optionalFlushInterval + "ms");
     // If prefix is null||empty then just name it hlog
     this.prefix = prefix == null || prefix.isEmpty() ?
@@ -945,8 +941,6 @@ public class HLog implements Syncable {
 
     private final long optionalFlushInterval;
 
-    private boolean syncerShuttingDown = false;
-
     LogSyncer(long optionalFlushInterval) {
       this.optionalFlushInterval = optionalFlushInterval;
     }
@@ -967,12 +961,12 @@ public class HLog implements Syncable {
       } catch (InterruptedException e) {
         LOG.debug(getName() + " interrupted while waiting for sync requests");
       } finally {
-        syncerShuttingDown = true;
         LOG.info(getName() + " exiting");
       }
     }
   }
 
+  @Override
   public void sync() throws IOException {
     synchronized (this.updateLock) {
       if (this.closed) {

Modified: hbase/trunk/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/resources/hbase-default.xml?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/main/resources/hbase-default.xml (original)
+++ hbase/trunk/src/main/resources/hbase-default.xml Wed May 25 04:48:39 2011
@@ -177,13 +177,6 @@
     </description>
   </property>
   <property>
-    <name>hbase.regionserver.flushlogentries</name>
-    <value>1</value>
-    <description>Sync the HLog to HDFS when it has accumulated this many
-    entries. Default 1. Value is checked on every HLog.hflush
-    </description>
-  </property>
-  <property>
     <name>hbase.regionserver.optionallogflushinterval</name>
     <value>1000</value>
     <description>Sync the HLog to the HDFS after this interval if it has not

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java Wed May
25 04:48:39 2011
@@ -48,7 +48,6 @@ public class TestFullLogReconstruction {
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     Configuration c = TEST_UTIL.getConfiguration();
-    c.setInt("hbase.regionserver.flushlogentries", 1);
     c.setBoolean("dfs.support.append", true);
     // quicker heartbeat interval for faster DN death notification
     c.setInt("heartbeat.recheck.interval", 5000);
@@ -57,7 +56,6 @@ public class TestFullLogReconstruction {
     // faster failover with cluster.shutdown();fs.close() idiom
     c.setInt("ipc.client.connect.max.retries", 1);
     c.setInt("dfs.client.block.recovery.retries", 1);
-    c.setInt("hbase.regionserver.flushlogentries", 1);
     TEST_UTIL.startMiniCluster(2);
   }
 

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWALObserver.java Wed
May 25 04:48:39 2011
@@ -97,7 +97,6 @@ public class TestWALObserver {
         SampleRegionWALObserver.class.getName());
     conf.setBoolean("dfs.support.append", true);
     conf.setInt("dfs.client.block.recovery.retries", 2);
-    conf.setInt("hbase.regionserver.flushlogentries", 1);
 
     TEST_UTIL.startMiniCluster(1);
     TEST_UTIL.setNameNodeNameSystemLeasePeriod(100, 10000);

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Wed May
25 04:48:39 2011
@@ -98,8 +98,6 @@ public class TestHLog  {
   public static void setUpBeforeClass() throws Exception {
     // Make block sizes small.
     TEST_UTIL.getConfiguration().setInt("dfs.blocksize", 1024 * 1024);
-    TEST_UTIL.getConfiguration().setInt(
-        "hbase.regionserver.flushlogentries", 1);
     // needed for testAppendClose()
     TEST_UTIL.getConfiguration().setBoolean("dfs.support.append", true);
     // quicker heartbeat interval for faster DN death notification

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
Wed May 25 04:48:39 2011
@@ -109,8 +109,6 @@ public class TestHLogSplit {
   @BeforeClass
   public static void setUpBeforeClass() throws Exception {
     TEST_UTIL.getConfiguration().
-            setInt("hbase.regionserver.flushlogentries", 1);
-    TEST_UTIL.getConfiguration().
             setBoolean("dfs.support.append", true);
     TEST_UTIL.getConfiguration().
             setStrings("hbase.rootdir", hbaseDir.toString());

Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java?rev=1127377&r1=1127376&r2=1127377&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
Wed May 25 04:48:39 2011
@@ -77,7 +77,6 @@ public class TestWALReplay {
     conf.setBoolean("dfs.support.append", true);
     // The below config supported by 0.20-append and CDH3b2
     conf.setInt("dfs.client.block.recovery.retries", 2);
-    conf.setInt("hbase.regionserver.flushlogentries", 1);
     TEST_UTIL.startMiniDFSCluster(3);
     TEST_UTIL.setNameNodeNameSystemLeasePeriod(100, 10000);
     Path hbaseRootDir =



Mime
View raw message