You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2010/12/08 22:38:25 UTC
svn commit: r1043688 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Author: jdcryans
Date: Wed Dec 8 21:38:25 2010
New Revision: 1043688
URL: http://svn.apache.org/viewvc?rev=1043688&view=rev
Log:
HBASE-3308 SplitTransaction.splitStoreFiles slows splits a lot
HBASE-3318 Split rollback leaves parent with writesEnabled=false
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1043688&r1=1043687&r2=1043688&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Wed Dec 8 21:38:25 2010
@@ -30,6 +30,8 @@ Release 0.91.0 - Unreleased
HBASE-3316 Add support for Java Serialization to HbaseObjectWritable
(Ed Kohlwey via Stack)
HBASE-1861 Multi-Family support for bulk upload tools
+ HBASE-3308 SplitTransaction.splitStoreFiles slows splits a lot
+
NEW FEATURES
HBASE-3287 Add option to cache blocks on hfile write and evict blocks on
@@ -759,6 +761,8 @@ Release 0.90.0 - Unreleased
HBASE-3314 [shell] 'move' is broken
HBASE-3315 Add debug output for when balancer makes bad balance
HBASE-3278 AssertionError in LoadBalancer
+ HBASE-3318 Split rollback leaves parent with writesEnabled=false
+
IMPROVEMENTS
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1043688&r1=1043687&r2=1043688&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Wed Dec 8 21:38:25 2010
@@ -376,10 +376,7 @@ public class HRegion implements HeapSize
SplitTransaction.cleanupAnySplitDetritus(this);
FSUtils.deleteDirectory(this.fs, new Path(regiondir, MERGEDIR));
- // See if region is meant to run read-only.
- if (this.regionInfo.getTableDesc().isReadOnly()) {
- this.writestate.setReadOnly(true);
- }
+ this.writestate.setReadOnly(this.regionInfo.getTableDesc().isReadOnly());
this.writestate.compacting = false;
this.lastFlushTime = EnvironmentEdgeManager.currentTimeMillis();
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=1043688&r1=1043687&r2=1043688&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Wed Dec 8 21:38:25 2010
@@ -23,7 +23,15 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.ListIterator;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -75,6 +83,7 @@ public class SplitTransaction {
private HRegionInfo hri_a;
private HRegionInfo hri_b;
private Path splitdir;
+ private long fileSplitTimeout = 30000;
/*
* Row to split around
@@ -186,6 +195,8 @@ public class SplitTransaction {
throw new IOException("Server is stopped or stopping");
}
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
if (this.parent.getCoprocessorHost() != null) {
@@ -394,11 +405,52 @@ public class SplitTransaction {
// Could be null because close didn't succeed -- for now consider it fatal
throw new IOException("Close returned empty list of StoreFiles");
}
+ // The following code sets up a thread pool executor with as many slots as
+ // there's files to split. It then fires up everything, waits for
+ // completion and finally checks for any exception
+ int nbFiles = hstoreFilesToSplit.size();
+ ThreadFactoryBuilder builder = new ThreadFactoryBuilder();
+ builder.setNameFormat("StoreFileSplitter-%1$d");
+ ThreadFactory factory = builder.build();
+ ThreadPoolExecutor threadPool =
+ (ThreadPoolExecutor) Executors.newFixedThreadPool(nbFiles, factory);
+ List<Future<Void>> futures = new ArrayList<Future<Void>>(nbFiles);
// Split each store file.
- for (StoreFile sf: hstoreFilesToSplit) {
- splitStoreFile(sf, splitdir);
- }
+ for (StoreFile sf: hstoreFilesToSplit) {
+ //splitStoreFile(sf, splitdir);
+ StoreFileSplitter sfs = new StoreFileSplitter(sf, splitdir);
+ futures.add(threadPool.submit(sfs));
+ }
+ // Shutdown the pool
+ threadPool.shutdown();
+
+ // Wait for all the tasks to finish
+ try {
+ boolean stillRunning = !threadPool.awaitTermination(
+ this.fileSplitTimeout, TimeUnit.MILLISECONDS);
+ if (stillRunning) {
+ threadPool.shutdownNow();
+ throw new IOException("Took too long to split the" +
+ " files and create the references, aborting split");
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new IOException("Interrupted while waiting for file splitters", e);
+ }
+
+ // Look for any exception
+ for (Future future : futures) {
+ try {
+ future.get();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw new IOException(
+ "Interrupted while trying to get the results of file splitters", e);
+ } catch (ExecutionException e) {
+ throw new IOException(e);
+ }
+ }
}
private void splitStoreFile(final StoreFile sf, final Path splitdir)
@@ -414,6 +466,31 @@ public class SplitTransaction {
}
/**
+ * Utility class used to do the file splitting / reference writing
+ * in parallel instead of sequentially.
+ */
+ class StoreFileSplitter implements Callable<Void> {
+
+ private final StoreFile sf;
+ private final Path splitdir;
+
+ /**
+ * Constructor that takes what it needs to split
+ * @param sf which file
+ * @param splitdir where the splitting is done
+ */
+ public StoreFileSplitter(final StoreFile sf, final Path splitdir) {
+ this.sf = sf;
+ this.splitdir = splitdir;
+ }
+
+ public Void call() throws IOException {
+ splitStoreFile(sf, splitdir);
+ return null;
+ }
+ }
+
+ /**
* @param hri Spec. for daughter region to open.
* @param flusher Flusher this region should use.
* @return Created daughter HRegion.