Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-4095 make cacheFlushLock.waittime longer 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1148691 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Zhihong Yu 2011-07-20 10:35:22 +00:00
parent f84529b0ae
commit b6fc5b0b80
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/apache/hadoop/hbase/regionserver/wal/HLog.java
View File

@ -346,7 +346,7 @@ public class HLog implements Syncable {
this.optionalFlushInterval = this.optionalFlushInterval =
conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000); conf.getLong("hbase.regionserver.optionallogflushinterval", 1 * 1000);
this.cacheFlushLockWaitTime = this.cacheFlushLockWaitTime =
conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 5000); conf.getLong("hbase.regionserver.cacheFlushLock.waittime", 25000);
if (failIfLogDirExists && fs.exists(dir)) { if (failIfLogDirExists && fs.exists(dir)) {
throw new IOException("Target HLog directory already exists: " + dir); throw new IOException("Target HLog directory already exists: " + dir);
} }

3
src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRolling.java
View File

@ -314,7 +314,8 @@ public class TestLogRolling {
writeData(table, 2); writeData(table, 2);
long newFilenum = log.getFilenum(); 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); newFilenum > oldFilenum && newFilenum > curTime);
// write some more log data (this should use a new hdfs_out) // write some more log data (this should use a new hdfs_out)