You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/02/16 09:35:34 UTC
kylin git commit: KYLIN-2451 Set HBASE_RPC_TIMEOUT according to
kylin.storage.hbase.coprocessor-timeout-seconds
Repository: kylin
Updated Branches:
refs/heads/master 8c0c44b88 -> e95c07156
KYLIN-2451 Set HBASE_RPC_TIMEOUT according to kylin.storage.hbase.coprocessor-timeout-seconds
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/e95c0715
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/e95c0715
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/e95c0715
Branch: refs/heads/master
Commit: e95c07156b983052955b3bead8afa99eaa250408
Parents: 8c0c44b
Author: Li Yang <li...@apache.org>
Authored: Thu Feb 16 17:35:28 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Thu Feb 16 17:35:28 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/KylinConfigBase.java | 1 -
.../org/apache/kylin/storage/hbase/HBaseConnection.java | 12 ++++++------
2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/e95c0715/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 9c54d68..2025a37 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
@@ -553,7 +553,6 @@ abstract public class KylinConfigBase implements Serializable {
private static final Pattern COPROCESSOR_JAR_NAME_PATTERN = Pattern.compile("kylin-coprocessor-(.+)\\.jar");
private static final Pattern JOB_JAR_NAME_PATTERN = Pattern.compile("kylin-job-(.+)\\.jar");
- private static final Pattern SPARK_JOB_JAR_NAME_PATTERN = Pattern.compile("kylin-engine-spark-(.+)\\.jar");
public String getCoprocessorLocalJar() {
final String coprocessorJar = getOptional("kylin.storage.hbase.coprocessor-local-jar");
http://git-wip-us.apache.org/repos/asf/kylin/blob/e95c0715/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 53c95cb..e3d2308 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
@@ -149,7 +149,8 @@ public class HBaseConnection {
addHBaseClusterNNHAConfiguration(conf);
// support hbase using a different FS
- String hbaseClusterFs = KylinConfig.getInstanceFromEnv().getHBaseClusterFs();
+ KylinConfig kylinConf = KylinConfig.getInstanceFromEnv();
+ String hbaseClusterFs = kylinConf.getHBaseClusterFs();
if (StringUtils.isNotEmpty(hbaseClusterFs)) {
conf.set(FileSystem.FS_DEFAULT_NAME_KEY, hbaseClusterFs);
}
@@ -162,11 +163,10 @@ public class HBaseConnection {
conf.set("hbase.fs.tmp.dir", "/tmp");
}
- // reduce rpc retry
- conf.set(HConstants.HBASE_CLIENT_PAUSE, "3000");
- conf.set(HConstants.HBASE_CLIENT_RETRIES_NUMBER, "5");
- conf.set(HConstants.HBASE_CLIENT_OPERATION_TIMEOUT, "60000");
- // conf.set(ScannerCallable.LOG_SCANNER_ACTIVITY, "true");
+ // set RPC timeout
+ if (kylinConf.getQueryCoprocessorTimeoutSeconds() > 0) {
+ conf.set(HConstants.HBASE_RPC_TIMEOUT_KEY, "" + (1000 * kylinConf.getQueryCoprocessorTimeoutSeconds()));
+ }
return conf;
}