Repository: hbase Updated Branches: refs/heads/master d2e338181 -> 8633b26ee
Revert "HBASE-14433 Set down the client executor core thread count from 256 to number of processors" This reverts commit d2e338181800ae3cef55ddca491901b65259dc7f. Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8633b26e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8633b26e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8633b26e Branch: refs/heads/master Commit: 8633b26ee5095e82a9792a86dc5c95a4cf23f858 Parents: d2e3381 Author: stack <[email protected]> Authored: Wed Sep 16 08:53:34 2015 -0700 Committer: stack <[email protected]> Committed: Wed Sep 16 08:53:34 2015 -0700 ---------------------------------------------------------------------- .../apache/hadoop/hbase/client/ConnectionImplementation.java | 6 ++---- hbase-client/src/test/resources/hbase-site.xml | 8 -------- hbase-server/src/test/resources/hbase-site.xml | 8 -------- 3 files changed, 2 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/8633b26e/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java index 0e8a03f..2262a0f 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/ConnectionImplementation.java @@ -370,9 +370,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { synchronized (this) { if (batchPool == null) { this.batchPool = getThreadPool(conf.getInt("hbase.hconnection.threads.max", 256), - conf.getInt("hbase.hconnection.threads.core", - Runtime.getRuntime().availableProcessors()), - "-shared-", null); + conf.getInt("hbase.hconnection.threads.core", 256), "-shared-", null); this.cleanupPool = true; } } @@ -387,7 +385,7 @@ class ConnectionImplementation implements ClusterConnection, Closeable { maxThreads = Runtime.getRuntime().availableProcessors() * 8; } if (coreThreads == 0) { - coreThreads = Runtime.getRuntime().availableProcessors(); + coreThreads = Runtime.getRuntime().availableProcessors() * 8; } long keepAliveTime = conf.getLong("hbase.hconnection.threads.keepalivetime", 60); BlockingQueue<Runnable> workQueue = passedWorkQueue; http://git-wip-us.apache.org/repos/asf/hbase/blob/8633b26e/hbase-client/src/test/resources/hbase-site.xml ---------------------------------------------------------------------- diff --git a/hbase-client/src/test/resources/hbase-site.xml b/hbase-client/src/test/resources/hbase-site.xml index 5788238..ab4d1cd 100644 --- a/hbase-client/src/test/resources/hbase-site.xml +++ b/hbase-client/src/test/resources/hbase-site.xml @@ -25,12 +25,4 @@ <name>hbase.defaults.for.version.skip</name> <value>true</value> </property> - <property> - <name>hbase.hconnection.meta.lookup.threads.core</name> - <value>4</value> - </property> - <property> - <name>hbase.hconnection.threads.keepalivetime</name> - <value>3</value> - </property> </configuration> http://git-wip-us.apache.org/repos/asf/hbase/blob/8633b26e/hbase-server/src/test/resources/hbase-site.xml ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/resources/hbase-site.xml b/hbase-server/src/test/resources/hbase-site.xml index 1ae5435..2d06c0a 100644 --- a/hbase-server/src/test/resources/hbase-site.xml +++ b/hbase-server/src/test/resources/hbase-site.xml @@ -162,12 +162,4 @@ Enable replay sanity checks on procedure tests. </description> </property> - <property> - <name>hbase.hconnection.meta.lookup.threads.core</name> - <value>4</value> - </property> - <property> - <name>hbase.hconnection.threads.keepalivetime</name> - <value>3</value> - </property> </configuration>
