You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2017/09/11 07:42:39 UTC
[12/50] [abbrv] hbase git commit: HBASE-17972 Remove mergePool from
CompactSplitThread
HBASE-17972 Remove mergePool from CompactSplitThread
Signed-off-by: tedyu <yu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/5ff04c5e
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/5ff04c5e
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/5ff04c5e
Branch: refs/heads/HBASE-18467
Commit: 5ff04c5e7fdf12946a3f0ae15ed7e83209f0e617
Parents: 137b105
Author: Guangxu Cheng <gu...@gmail.com>
Authored: Thu Sep 7 19:52:27 2017 +0800
Committer: tedyu <yu...@gmail.com>
Committed: Thu Sep 7 09:39:53 2017 -0700
----------------------------------------------------------------------
.../hadoop/hbase/regionserver/CompactSplit.java | 14 --------------
.../hbase/regionserver/TestCompactSplitThread.java | 3 ---
2 files changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ff04c5e/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
index 5638e8e..c0fc741 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplit.java
@@ -74,10 +74,6 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati
public final static String SPLIT_THREADS = "hbase.regionserver.thread.split";
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 =
"hbase.regionserver.regionSplitLimit";
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 shortCompactions;
private final ThreadPoolExecutor splits;
- private final ThreadPoolExecutor mergePool;
private volatile ThroughputController compactionThroughputController;
@@ -151,15 +146,6 @@ public class CompactSplit implements CompactionRequestor, PropagatingConfigurati
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
this.compactionThroughputController =
http://git-wip-us.apache.org/repos/asf/hbase/blob/5ff04c5e/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
index 09fb01f..6d06494 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCompactSplitThread.java
@@ -80,7 +80,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 3);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 4);
conf.setInt(CompactSplit.SPLIT_THREADS, 5);
- conf.setInt(CompactSplit.MERGE_THREADS, 6);
}
@After
@@ -118,7 +117,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 4);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 5);
conf.setInt(CompactSplit.SPLIT_THREADS, 6);
- conf.setInt(CompactSplit.MERGE_THREADS, 7);
try {
regionServer.compactSplitThread.onConfigurationChange(conf);
} catch (IllegalArgumentException iae) {
@@ -134,7 +132,6 @@ public class TestCompactSplitThread {
conf.setInt(CompactSplit.LARGE_COMPACTION_THREADS, 2);
conf.setInt(CompactSplit.SMALL_COMPACTION_THREADS, 3);
conf.setInt(CompactSplit.SPLIT_THREADS, 4);
- conf.setInt(CompactSplit.MERGE_THREADS, 5);
try {
regionServer.compactSplitThread.onConfigurationChange(conf);
} catch (IllegalArgumentException iae) {