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/04/10 10:07:57 UTC
[1/2] kylin git commit: KYLIN-2537 hbase r/w bug fix [Forced Update!]
Repository: kylin
Updated Branches:
refs/heads/KYLIN-2537 04e324f5c -> 33872bb6d (forced update)
KYLIN-2537 hbase r/w bug fix
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/3da55b80
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/3da55b80
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/3da55b80
Branch: refs/heads/KYLIN-2537
Commit: 3da55b8012e1cefdce00a3a8f4169ab77c862c5d
Parents: 2e87fb4
Author: Li Yang <li...@apache.org>
Authored: Mon Apr 10 14:12:18 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Mon Apr 10 17:18:19 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/storage/hbase/HBaseConnection.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/3da55b80/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 73f31c5..7e2cefc 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
@@ -196,10 +196,13 @@ public class HBaseConnection {
conf.setStrings(JOB_NAMENODES_TOKEN_RENEWAL_EXCLUDE, nameServices.toArray(new String[0]));
}
- public static String makeQualifiedPathInHBaseCluster(String path) {
+ public static String makeQualifiedPathInHBaseCluster(String inPath) {
+ Path path = new Path(inPath);
+ path = Path.getPathWithoutSchemeAndAuthority(path);
+
try {
FileSystem fs = FileSystem.get(getCurrentHBaseConfiguration());
- return fs.makeQualified(new Path(path)).toString();
+ return fs.makeQualified(path).toString();
} catch (IOException e) {
throw new IllegalArgumentException("Cannot create FileSystem from current hbase cluster conf", e);
}
[2/2] kylin git commit: further fix
Posted by li...@apache.org.
further fix
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/33872bb6
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/33872bb6
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/33872bb6
Branch: refs/heads/KYLIN-2537
Commit: 33872bb6d151d6c11dc6925332eafa12d598821d
Parents: 3da55b8
Author: Li Yang <li...@apache.org>
Authored: Mon Apr 10 18:07:50 2017 +0800
Committer: Li Yang <li...@apache.org>
Committed: Mon Apr 10 18:07:50 2017 +0800
----------------------------------------------------------------------
.../org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/33872bb6/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
----------------------------------------------------------------------
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
index 29c738e..d51b71e 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
@@ -420,6 +420,7 @@ public class DeployCoprocessorCLI {
private static Path getCoprocessorHDFSDir(FileSystem fileSystem, KylinConfig config) throws IOException {
String hdfsWorkingDirectory = config.getHdfsWorkingDirectory();
+ hdfsWorkingDirectory = HBaseConnection.makeQualifiedPathInHBaseCluster(hdfsWorkingDirectory);
Path coprocessorDir = new Path(hdfsWorkingDirectory, "coprocessor");
fileSystem.mkdirs(coprocessorDir);
return coprocessorDir;