Repository: kylin Updated Branches: refs/heads/1.x-staging d641ed5a6 -> 09a49554d
fix ci: disable export htables to tar ball by default Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/09a49554 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/09a49554 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/09a49554 Branch: refs/heads/1.x-staging Commit: 09a49554d30c85f336f6a9f73b0c13023be8d058 Parents: d641ed5 Author: shaofengshi <shaofeng...@apache.org> Authored: Wed Dec 30 13:24:47 2015 +0800 Committer: shaofengshi <shaofeng...@apache.org> Committed: Tue Jan 5 10:54:45 2016 +0800 ---------------------------------------------------------------------- .../org/apache/kylin/common/persistence/HBaseConnection.java | 4 ++-- .../test/java/org/apache/kylin/job/BuildIIWithEngineTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/09a49554/common/src/main/java/org/apache/kylin/common/persistence/HBaseConnection.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/kylin/common/persistence/HBaseConnection.java b/common/src/main/java/org/apache/kylin/common/persistence/HBaseConnection.java index 9c86376..5b8fe54 100644 --- a/common/src/main/java/org/apache/kylin/common/persistence/HBaseConnection.java +++ b/common/src/main/java/org/apache/kylin/common/persistence/HBaseConnection.java @@ -64,13 +64,13 @@ public class HBaseConnection { } public static HConnection get(String url) { - // find configuration - Configuration conf = HadoopUtil.getCurrentHBaseConfiguration(); HConnection connection = ConnPool.get(url); try { // I don't use DCL since recreate a connection is not a big issue. if (connection == null) { + // find configuration + Configuration conf = HadoopUtil.getCurrentHBaseConfiguration(); connection = HConnectionManager.createConnection(conf); ConnPool.put(url, connection); } http://git-wip-us.apache.org/repos/asf/kylin/blob/09a49554/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java ---------------------------------------------------------------------- diff --git a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java index 4d039cf..fb9167b 100644 --- a/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java +++ b/job/src/test/java/org/apache/kylin/job/BuildIIWithEngineTest.java @@ -231,7 +231,7 @@ public class BuildIIWithEngineTest { private void backup() throws Exception { int exitCode = cleanupOldStorage(); - if (exitCode == 0) { + if (exitCode == 0 && "true".equals(System.getProperty("kylin.exportHtables"))) { exportHBaseData(); } }
