You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2015/11/24 06:41:08 UTC
[1/2] incubator-kylin git commit: KYLIN-1157 copy ACL when migrate
cube - small fix
Repository: incubator-kylin
Updated Branches:
refs/heads/1.x-staging f3214dd8b -> 9a65df194
KYLIN-1157 copy ACL when migrate cube - small fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/9a65df19
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/9a65df19
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/9a65df19
Branch: refs/heads/1.x-staging
Commit: 9a65df1940cc1fea05ef146da275d07919e25fad
Parents: 7e7edff
Author: shaofengshi <sh...@apache.org>
Authored: Tue Nov 24 13:39:13 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Nov 24 13:41:01 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/9a65df19/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
index e3f7c11..ca756d1 100644
--- a/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
+++ b/job/src/main/java/org/apache/kylin/job/tools/CubeMigrationCLI.java
@@ -76,7 +76,7 @@ public class CubeMigrationCLI {
public static void main(String[] args) throws IOException, InterruptedException {
- if (args.length != 6) {
+ if (args.length != 7) {
usage();
System.exit(1);
}
@@ -123,7 +123,7 @@ public class CubeMigrationCLI {
renameFoldersInHdfs(cube);
changeHtableHost(cube);
addCubeIntoProject(cubeName, projectName);
- if (Boolean.valueOf(copyAcl).booleanValue() == true) {
+ if (Boolean.parseBoolean(copyAcl) == true) {
copyACL(cube);
}
[2/2] incubator-kylin git commit: KYLIN-1149 add a sleep when wrong
url is got from yarn
Posted by sh...@apache.org.
KYLIN-1149 add a sleep when wrong url is got from yarn
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/7e7edff9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/7e7edff9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/7e7edff9
Branch: refs/heads/1.x-staging
Commit: 7e7edff9f5d0097045ffbd561753c437e04b34c3
Parents: f3214dd
Author: shaofengshi <sh...@apache.org>
Authored: Tue Nov 24 11:31:09 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Tue Nov 24 13:41:01 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7e7edff9/job/src/main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java b/job/src/main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java
index e2c0aa0..a3c411b 100644
--- a/job/src/main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java
+++ b/job/src/main/java/org/apache/kylin/job/tools/HadoopStatusGetter.java
@@ -85,6 +85,7 @@ public class HadoopStatusGetter {
redirect = h.getValue();
if (isValidURL(redirect) == false) {
log.info("Get invalid redirect url, skip it: " + redirect);
+ Thread.sleep(1000l);
continue;
}
} else {
@@ -97,6 +98,7 @@ public class HadoopStatusGetter {
if (isValidURL(redirect) == false) {
log.info("Get invalid redirect url, skip it: " + redirect);
+ Thread.sleep(1000l);
continue;
}
}
@@ -110,6 +112,8 @@ public class HadoopStatusGetter {
url = redirect;
log.debug("Job " + mrJobId + " check redirect url " + url + ".\n");
}
+ } catch (InterruptedException e) {
+ log.error(e.getMessage());
} finally {
get.releaseConnection();
}