svn commit: r890547 - in /hadoop/hbase/trunk: conf/hbase-default.xml src/java/org/apache/hadoop/hbase/HTableDescriptor.java src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java

[jd...@apache.org]

Author: jdcryans
Date: Mon Dec 14 23:16:05 2009
New Revision: 890547

URL: http://svn.apache.org/viewvc?rev=890547&view=rev
Log:
HBASE-2041  Change WAL default configuration values

Modified:
    hadoop/hbase/trunk/conf/hbase-default.xml
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java

Modified: hadoop/hbase/trunk/conf/hbase-default.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/conf/hbase-default.xml?rev=890547&r1=890546&r2=890547&view=diff
==============================================================================
--- hadoop/hbase/trunk/conf/hbase-default.xml (original)
+++ hadoop/hbase/trunk/conf/hbase-default.xml Mon Dec 14 23:16:05 2009
@@ -171,16 +171,16 @@
   </property>
   <property>
     <name>hbase.regionserver.flushlogentries</name>
-    <value>100</value>
+    <value>1</value>
     <description>Sync the HLog to the HDFS when it has accumulated this many
-    entries. Default 100. Value is checked on every HLog.append
+    entries. Default 1. Value is checked on every HLog.hflush
     </description>
   </property>
   <property>
     <name>hbase.regionserver.optionallogflushinterval</name>
-    <value>10000</value>
+    <value>1000</value>
     <description>Sync the HLog to the HDFS after this interval if it has not
-    accumulated enough entries to trigger a sync. Default 10 seconds. Units:
+    accumulated enough entries to trigger a sync. Default 1 second. Units:
     milliseconds.
     </description>
   </property>

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java?rev=890547&r1=890546&r2=890547&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HTableDescriptor.java Mon Dec 14 23:16:05 2009
@@ -95,7 +95,7 @@
   
   public static final int DEFAULT_MAX_FILESIZE = 1024*1024*256;
 
-  public static final boolean DEFAULT_DEFERRED_LOG_FLUSH = false;
+  public static final boolean DEFAULT_DEFERRED_LOG_FLUSH = true;
     
   private volatile Boolean meta = null;
   private volatile Boolean root = null;

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java?rev=890547&r1=890546&r2=890547&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java Mon Dec 14 23:16:05 2009
@@ -215,7 +215,7 @@
     this.conf = conf;
     this.listener = listener;
     this.flushlogentries =
-      conf.getInt("hbase.regionserver.flushlogentries", 100);
+      conf.getInt("hbase.regionserver.flushlogentries", 1);
     this.blocksize = conf.getLong("hbase.regionserver.hlog.blocksize",
       this.fs.getDefaultBlockSize());
     this.replicationLevel = (short) conf.getInt("hbase.regionserver.hlog.replication",
@@ -224,7 +224,7 @@
     float multi = conf.getFloat("hbase.regionserver.logroll.multiplier", 0.95f);
     this.logrollsize = (long)(this.blocksize * multi);
     this.optionalFlushInterval =
-      conf.getLong("hbase.regionserver.optionallogflushinterval", 10 * 1000);
+      conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000);
     if (fs.exists(dir)) {
       throw new IOException("Target HLog directory already exists: " + dir);
     }