kylin git commit: KYLIN-1753 Set coreThreads configurable

2016-06-02 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/master 2d6cd529d -> 18516c5e7


KYLIN-1753 Set coreThreads configurable


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/18516c5e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/18516c5e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/18516c5e

Branch: refs/heads/master
Commit: 18516c5e77719a933b2d6b7fd48b13727f491a19
Parents: 2d6cd52
Author: lidongsjtu 
Authored: Fri Jun 3 10:02:20 2016 +0800
Committer: lidongsjtu 
Committed: Fri Jun 3 10:02:20 2016 +0800

--
 .../java/org/apache/kylin/common/KylinConfigBase.java   | 12 ++--
 .../org/apache/kylin/storage/hbase/HBaseConnection.java |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/18516c5e/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
--
diff --git 
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index faf54d2..bc84c65 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -756,10 +756,18 @@ abstract public class KylinConfigBase implements 
Serializable {
 }
 
 public int getHBaseMaxConnectionThreads() {
-return 
Integer.parseInt(getOptional("kylin.query.hbase.hconnection.threads.max", 
"3072"));
+return 
Integer.parseInt(getOptional("kylin.query.hbase.hconnection.threads.max", 
"2048"));
+}
+
+public int getHBaseCoreConnectionThreads() {
+return 
Integer.parseInt(getOptional("kylin.query.hbase.hconnection.threads.core", 
"2048"));
+}
+
+public long getHBaseConnectionThreadPoolAliveSeconds() {
+return 
Long.parseLong(getOptional("kylin.query.hbase.hconnection.threads.alive.seconds",
 "60"));
 }
 
 public long getStorageCleanupTimeThreshold() {
-return 
Long.valueOf(this.getOptional("kylin.storage.cleanup.time.threshold", 
"17280"));//default two days
+return 
Long.valueOf(this.getOptional("kylin.storage.cleanup.time.threshold", 
"17280")); //default two days
 }
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/18516c5e/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
index 09c14e1..31773a0 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
@@ -93,8 +93,8 @@ public class HBaseConnection {
 
 // copy from HConnectionImplementation.getBatchPool()
 int maxThreads = config.getHBaseMaxConnectionThreads();
-int coreThreads = 256;
-long keepAliveTime = 60;
+int coreThreads = config.getHBaseCoreConnectionThreads();
+long keepAliveTime = 
config.getHBaseConnectionThreadPoolAliveSeconds();
 LinkedBlockingQueue workQueue = new 
LinkedBlockingQueue(maxThreads * 100);
 ThreadPoolExecutor tpe = new ThreadPoolExecutor(coreThreads, 
maxThreads, keepAliveTime, TimeUnit.SECONDS, workQueue, //
 Threads.newDaemonThreadFactory("kylin-coproc-"));

kylin git commit: KYLIN-1753 Set coreThreads configurable

2016-06-01 Thread lidong 
Repository: kylin
Updated Branches:
  refs/heads/yang-m2 399d67183 -> 52c7e37e9


KYLIN-1753 Set coreThreads configurable


Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/52c7e37e
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/52c7e37e
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/52c7e37e

Branch: refs/heads/yang-m2
Commit: 52c7e37e90f7223777db850d02cf7c01383a17ca
Parents: 399d671
Author: lidongsjtu 
Authored: Wed Jun 1 16:21:08 2016 +0800
Committer: lidongsjtu 
Committed: Wed Jun 1 16:21:08 2016 +0800

--
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java   | 4 
 .../java/org/apache/kylin/storage/hbase/HBaseConnection.java | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/kylin/blob/52c7e37e/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
--
diff --git 
a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java 
b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 6918721..036cdeb 100644
--- a/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -653,4 +653,8 @@ abstract public class KylinConfigBase implements 
Serializable {
 public int getHBaseMaxConnectionThreads() {
 return 
Integer.parseInt(getOptional("kylin.query.hbase.hconnection.threads.max", 
"3072"));
 }
+
+public int getHBaseCoreConnectionThreads() {
+return 
Integer.parseInt(getOptional("kylin.query.hbase.hconnection.threads.core", 
"256"));
+}
 }

http://git-wip-us.apache.org/repos/asf/kylin/blob/52c7e37e/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
--
diff --git 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
index 09c14e1..db33436 100644
--- 
a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
+++ 
b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
@@ -93,7 +93,7 @@ public class HBaseConnection {
 
 // copy from HConnectionImplementation.getBatchPool()
 int maxThreads = config.getHBaseMaxConnectionThreads();
-int coreThreads = 256;
+int coreThreads = config.getHBaseCoreConnectionThreads();
 long keepAliveTime = 60;
 LinkedBlockingQueue workQueue = new 
LinkedBlockingQueue(maxThreads * 100);
 ThreadPoolExecutor tpe = new ThreadPoolExecutor(coreThreads, 
maxThreads, keepAliveTime, TimeUnit.SECONDS, workQueue, //