svn commit: r1148691 - in /hbase/trunk/src: main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java

[tedyu]

Author: tedyu
Date: Wed Jul 20 10:35:22 2011
New Revision: 1148691

URL: http://svn.apache.org/viewvc?rev=1148691&view=rev
Log:
HBASE-4095 make cacheFlushLock.waittime longer

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
    
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java

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=1148691&r1=1148690&r2=1148691&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 Jul 20 10:35:22 2011
@@ -346,7 +346,7 @@ public class HLog implements Syncable {
     this.optionalFlushInterval =
       conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000);
     this.cacheFlushLockWaitTime = 
-        conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 5000);
+        conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 25000);
     if (failIfLogDirExists && fs.exists(dir)) {
       throw new IOException("Target HLog directory already exists: " + dir);
     }

Modified: 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java?rev=1148691&r1=1148690&r2=1148691&view=diff
==============================================================================
--- 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
 (original)
+++ 
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
 Wed Jul 20 10:35:22 2011
@@ -314,7 +314,8 @@ public class TestLogRolling  {
     writeData(table, 2);
     long newFilenum = log.getFilenum();
 
-    assertTrue("Missing datanode should've triggered a log roll",
+    assertTrue("Missing datanode should've triggered a log roll: " + newFilenum
+                    + " " + oldFilenum + " " + curTime,
         newFilenum > oldFilenum && newFilenum > curTime);
 
     // write some more log data (this should use a new hdfs_out)