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

HBASE-3308 Fix for TestHRegion 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1044520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jean-Daniel Cryans 2010-12-10 21:46:14 +00:00
parent ceaf3ee3d7
commit 05406e9e42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
View File

@ -195,8 +195,6 @@ public class SplitTransaction {
throw new IOException("Server is stopped or stopping"); throw new IOException("Server is stopped or stopping");
} }
assert !this.parent.lock.writeLock().isHeldByCurrentThread() : "Unsafe to hold write lock while performing RPCs"; assert !this.parent.lock.writeLock().isHeldByCurrentThread() : "Unsafe to hold write lock while performing RPCs";
this.fileSplitTimeout = server.getConfiguration().getLong(
"hbase.regionserver.fileSplitTimeout", this.fileSplitTimeout);
// Coprocessor callback // Coprocessor callback
if (this.parent.getCoprocessorHost() != null) { if (this.parent.getCoprocessorHost() != null) {
@ -206,6 +204,9 @@ public class SplitTransaction {
// If true, no cluster to write meta edits into. // If true, no cluster to write meta edits into.
boolean testing = server == null? true: boolean testing = server == null? true:
server.getConfiguration().getBoolean("hbase.testing.nocluster", false); server.getConfiguration().getBoolean("hbase.testing.nocluster", false);
this.fileSplitTimeout = testing ? this.fileSplitTimeout :
server.getConfiguration().getLong(
"hbase.regionserver.fileSplitTimeout", this.fileSplitTimeout);
createSplitDir(this.parent.getFilesystem(), this.splitdir); createSplitDir(this.parent.getFilesystem(), this.splitdir);
this.journal.add(JournalEntry.CREATE_SPLIT_DIR); this.journal.add(JournalEntry.CREATE_SPLIT_DIR);