You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2011/05/25 06:50:17 UTC
svn commit: r1127378 - in /hbase/branches/0.90: ./
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/regionserver/wal/
Author: stack
Date: Wed May 25 04:50:16 2011
New Revision: 1127378
URL: http://svn.apache.org/viewvc?rev=1127378&view=rev
Log:
HBASE-3920 HLog hbase.regionserver.flushlogentries no longer supported
Modified:
hbase/branches/0.90/CHANGES.txt
hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
hbase/branches/0.90/src/main/resources/hbase-default.xml
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
Modified: hbase/branches/0.90/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/CHANGES.txt?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/CHANGES.txt (original)
+++ hbase/branches/0.90/CHANGES.txt Wed May 25 04:50:16 2011
@@ -24,6 +24,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
BUG FIXES
Modified: hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original)
+++ hbase/branches/0.90/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Wed May 25 04:50:16 2011
@@ -126,7 +126,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;
@@ -338,8 +337,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.
@@ -365,7 +362,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() ?
@@ -946,8 +942,6 @@ public class HLog implements Syncable {
private final long optionalFlushInterval;
- private boolean syncerShuttingDown = false;
-
LogSyncer(long optionalFlushInterval) {
this.optionalFlushInterval = optionalFlushInterval;
}
@@ -968,12 +962,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/branches/0.90/src/main/resources/hbase-default.xml
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/main/resources/hbase-default.xml?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/main/resources/hbase-default.xml (original)
+++ hbase/branches/0.90/src/main/resources/hbase-default.xml Wed May 25 04:50:16 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/branches/0.90/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/TestFullLogReconstruction.java Wed May 25 04:50:16 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/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLog.java Wed May 25 04:50:16 2011
@@ -94,8 +94,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/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestHLogSplit.java Wed May 25 04:50:16 2011
@@ -108,8 +108,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/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java?rev=1127378&r1=1127377&r2=1127378&view=diff
==============================================================================
--- hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java (original)
+++ hbase/branches/0.90/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestWALReplay.java Wed May 25 04:50:16 2011
@@ -75,7 +75,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 =