Repository: kylin Updated Branches: refs/heads/master ffbe1eebb -> 873c8a83e
KYLIN-1739 Do not cache and reuse hadoop configuration in HadoopUtil Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/873c8a83 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/873c8a83 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/873c8a83 Branch: refs/heads/master Commit: 873c8a83e7513756bbf834b7d8bdc49ffad929dd Parents: ffbe1ee Author: Li Yang <liy...@apache.org> Authored: Thu May 26 14:00:01 2016 +0800 Committer: Li Yang <liy...@apache.org> Committed: Thu May 26 14:00:01 2016 +0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java | 3 +-- .../apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/873c8a83/engine-mr/src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java ---------------------------------------------------------------------- diff --git a/engine-mr/src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java b/engine-mr/src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java index 9ce2bab..c638d99 100644 --- a/engine-mr/src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java +++ b/engine-mr/src/main/java/org/apache/kylin/engine/mr/HadoopUtil.java @@ -41,8 +41,7 @@ public class HadoopUtil { public static Configuration getCurrentConfiguration() { if (hadoopConfig.get() == null) { Configuration conf = healSickConfig(new Configuration()); - - hadoopConfig.set(conf); + return conf; } return hadoopConfig.get(); } http://git-wip-us.apache.org/repos/asf/kylin/blob/873c8a83/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java index f071a1b..4a4a1a7 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/cube/v2/CubeHBaseEndpointRPC.java @@ -91,7 +91,7 @@ public class CubeHBaseEndpointRPC extends CubeHBaseRPC { this.expectedSize = expectedSize; this.queue = new ArrayBlockingQueue<byte[]>(expectedSize); - this.timeout = HadoopUtil.getCurrentConfiguration().getInt(HConstants.HBASE_RPC_TIMEOUT_KEY, HConstants.DEFAULT_HBASE_RPC_TIMEOUT); + this.timeout = HBaseConnection.getCurrentHBaseConfiguration().getInt(HConstants.HBASE_RPC_TIMEOUT_KEY, HConstants.DEFAULT_HBASE_RPC_TIMEOUT); this.timeout *= KylinConfig.getInstanceFromEnv().getCubeVisitTimeoutTimes(); if (BackdoorToggles.getQueryTimeout() != -1) {
