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

HBASE-17972 Remove mergePool from CompactSplitThread 

Signed-off-by: tedyu <yuzhihong@gmail.com>
This commit is contained in:
Guangxu Cheng 2017-09-07 19:52:27 +08:00 committed by tedyu
parent 137b105c67
commit 5ff04c5e7f
2 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
View File

@ -74,10 +74,6 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati
public final static String SPLIT_THREADS = "hbase.regionserver.thread.split"; public final static String SPLIT_THREADS = "hbase.regionserver.thread.split";
public final static int SPLIT_THREADS_DEFAULT = 1; public final static int SPLIT_THREADS_DEFAULT = 1;
// Configuration keys for merge threads
public final static String MERGE_THREADS = "hbase.regionserver.thread.merge";
public final static int MERGE_THREADS_DEFAULT = 1;
public static final String REGION_SERVER_REGION_SPLIT_LIMIT = public static final String REGION_SERVER_REGION_SPLIT_LIMIT =
"hbase.regionserver.regionSplitLimit"; "hbase.regionserver.regionSplitLimit";
public static final int DEFAULT_REGION_SERVER_REGION_SPLIT_LIMIT= 1000; public static final int DEFAULT_REGION_SERVER_REGION_SPLIT_LIMIT= 1000;
@ -88,7 +84,6 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati
private final ThreadPoolExecutor longCompactions; private final ThreadPoolExecutor longCompactions;
private final ThreadPoolExecutor shortCompactions; private final ThreadPoolExecutor shortCompactions;
private final ThreadPoolExecutor splits; private final ThreadPoolExecutor splits;
private final ThreadPoolExecutor mergePool;
private volatile ThroughputController compactionThroughputController; private volatile ThroughputController compactionThroughputController;
@ -151,15 +146,6 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati
return new Thread(r, name); return new Thread(r, name);
} }
}); });
int mergeThreads = conf.getInt(MERGE_THREADS, MERGE_THREADS_DEFAULT);
this.mergePool = (ThreadPoolExecutor) Executors.newFixedThreadPool(
mergeThreads, new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
String name = n + "-merges-" + System.currentTimeMillis();
return new Thread(r, name);
}
});
// compaction throughput controller // compaction throughput controller
this.compactionThroughputController = this.compactionThroughputController =

3
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
View File

@ -80,7 +80,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 3); conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 3);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 4); conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 4);
conf.setInt(CompactSplit.SPLIT_THREADS, 5); conf.setInt(CompactSplit.SPLIT_THREADS, 5);
conf.setInt(CompactSplit.MERGE_THREADS, 6);
} }
@After @After
@ -118,7 +117,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 4); conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 4);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 5); conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 5);
conf.setInt(CompactSplit.SPLIT_THREADS, 6); conf.setInt(CompactSplit.SPLIT_THREADS, 6);
conf.setInt(CompactSplit.MERGE_THREADS, 7);
try { try {
regionServer.compactSplitThread.onConfigurationChange(conf); regionServer.compactSplitThread.onConfigurationChange(conf);
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {
@ -134,7 +132,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 2); conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 2);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 3); conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 3);
conf.setInt(CompactSplit.SPLIT_THREADS, 4); conf.setInt(CompactSplit.SPLIT_THREADS, 4);
conf.setInt(CompactSplit.MERGE_THREADS, 5);
try { try {
regionServer.compactSplitThread.onConfigurationChange(conf); regionServer.compactSplitThread.onConfigurationChange(conf);
} catch (IllegalArgumentException iae) { } catch (IllegalArgumentException iae) {