You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/05/15 07:23:43 UTC
[1/3] incubator-kylin git commit: KYLIN-757 Broadcast cube event to
cluster
Repository: incubator-kylin
Updated Branches:
refs/heads/0.7.1-staging 124121764 -> 6ef70b8e8
KYLIN-757 Broadcast cube event to cluster
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6cded030
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6cded030
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6cded030
Branch: refs/heads/0.7.1-staging
Commit: 6cded030303022c80cb4737dc2dec6f4a348d92c
Parents: 1241217
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue May 12 14:32:46 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Tue May 12 14:32:46 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kylin/common/KylinConfig.java | 16 +++++++++++-----
.../apache/kylin/common/restclient/Broadcaster.java | 2 ++
2 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6cded030/common/src/main/java/org/apache/kylin/common/KylinConfig.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/KylinConfig.java b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
index 3e3f4a3..536f34c 100644
--- a/common/src/main/java/org/apache/kylin/common/KylinConfig.java
+++ b/common/src/main/java/org/apache/kylin/common/KylinConfig.java
@@ -19,6 +19,7 @@
package org.apache.kylin.common;
import com.google.common.collect.Sets;
+import jodd.util.StringUtil;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.commons.configuration.PropertiesConfiguration;
import org.apache.commons.io.IOUtils;
@@ -414,10 +415,7 @@ public class KylinConfig {
}
public String[] getRestServers() {
- String nodes = getOptional(KYLIN_REST_SERVERS);
- if (StringUtils.isBlank(nodes))
- return null;
- return nodes.split("\\s*,\\s*");
+ return getOptionalStringArray(KYLIN_REST_SERVERS);
}
/**
@@ -471,6 +469,15 @@ public class KylinConfig {
return property != null ? property : kylinConfig.getString(prop);
}
+
+ private String[] getOptionalStringArray(String prop) {
+ final String property = System.getProperty(prop);
+ if (!StringUtil.isBlank(property))
+ return property.split("\\s*,\\s*");
+
+ return kylinConfig.getStringArray(prop);
+ }
+
private String getOptional(String prop, String dft) {
final String property = System.getProperty(prop);
return property != null ? property : kylinConfig.getString(prop, dft);
@@ -490,7 +497,6 @@ public class KylinConfig {
void reloadKylinConfig(InputStream is) {
PropertiesConfiguration config = new PropertiesConfiguration();
- config.setListDelimiter((char)0); // disable list delimiter, Kylin will parse and split
try {
config.load(is);
} catch (ConfigurationException e) {
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6cded030/common/src/main/java/org/apache/kylin/common/restclient/Broadcaster.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/kylin/common/restclient/Broadcaster.java b/common/src/main/java/org/apache/kylin/common/restclient/Broadcaster.java
index f591b11..b636e89 100644
--- a/common/src/main/java/org/apache/kylin/common/restclient/Broadcaster.java
+++ b/common/src/main/java/org/apache/kylin/common/restclient/Broadcaster.java
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.concurrent.BlockingDeque;
import java.util.concurrent.ExecutorService;
@@ -60,6 +61,7 @@ public class Broadcaster {
logger.warn("There is no available rest server; check the 'kylin.rest.servers' config");
return;
}
+ logger.debug(nodes.length + " nodes in the cluster: " + Arrays.toString(nodes));
final List<RestClient> restClients = Lists.newArrayList();
for (String node : nodes) {
restClients.add(new RestClient(node));
[3/3] incubator-kylin git commit: KYLIN-765 When a cube job is failed,
still be possible to submit a new job
Posted by ma...@apache.org.
KYLIN-765 When a cube job is failed, still be possible to submit a new job
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/6ef70b8e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/6ef70b8e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/6ef70b8e
Branch: refs/heads/0.7.1-staging
Commit: 6ef70b8e847e9420889218243a58be74115c019d
Parents: 2439b9b
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu May 14 15:24:14 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu May 14 15:24:14 2015 +0800
----------------------------------------------------------------------
server/src/main/java/org/apache/kylin/rest/service/JobService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/6ef70b8e/server/src/main/java/org/apache/kylin/rest/service/JobService.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/service/JobService.java b/server/src/main/java/org/apache/kylin/rest/service/JobService.java
index 05031b9..e0f8a99 100644
--- a/server/src/main/java/org/apache/kylin/rest/service/JobService.java
+++ b/server/src/main/java/org/apache/kylin/rest/service/JobService.java
@@ -122,7 +122,7 @@ public class JobService extends BasicService {
final List<CubingJob> cubingJobs = listAllCubingJobs(cube.getName(), null, EnumSet.allOf(ExecutableState.class));
for (CubingJob job : cubingJobs) {
- if (job.getStatus() == ExecutableState.READY || job.getStatus() == ExecutableState.RUNNING) {
+ if (job.getStatus() == ExecutableState.READY || job.getStatus() == ExecutableState.RUNNING || job.getStatus() == ExecutableState.ERROR) {
throw new JobException("The cube " + cube.getName() + " has running job(" + job.getId() + ") please discard it and try again.");
}
}
[2/3] incubator-kylin git commit: KYLIN-761 exclude calcite jars in
find-hive-dependency.sh
Posted by ma...@apache.org.
KYLIN-761 exclude calcite jars in find-hive-dependency.sh
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/2439b9b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/2439b9b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/2439b9b5
Branch: refs/heads/0.7.1-staging
Commit: 2439b9b5289d6c1cefe6dd49fc3403b2d1644ff6
Parents: 6cded03
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Thu May 14 10:32:59 2015 +0800
Committer: Shao Feng, Shi <sh...@ebay.com>
Committed: Thu May 14 10:32:59 2015 +0800
----------------------------------------------------------------------
bin/find-hive-dependency.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/2439b9b5/bin/find-hive-dependency.sh
----------------------------------------------------------------------
diff --git a/bin/find-hive-dependency.sh b/bin/find-hive-dependency.sh
index 4adf739..0348c9c 100644
--- a/bin/find-hive-dependency.sh
+++ b/bin/find-hive-dependency.sh
@@ -39,6 +39,7 @@ done
hdp_home=`echo $hive_exec_path | awk -F '/hive/lib/' '{print $1}'`
hcatalog=`find $hdp_home -name "hive-hcatalog-core[0-9\.-]*jar" 2>&1 | grep -m 1 -v 'Permission denied'`
+hive_lib=`find "$hdp_home/hive/lib" -name '*.jar' ! -name '*calcite*' -printf '%p:' | sed 's/:$//'`
if [ -z "$hcatalog" ]
then
@@ -46,6 +47,6 @@ then
exit 1
fi
-hive_dependency=${hive_conf_path}:${hdp_home}/hive/lib/*:${hcatalog}
+hive_dependency=${hive_conf_path}:${hive_lib}:${hcatalog}
echo "hive dependency: $hive_dependency"
export hive_dependency
\ No newline at end of file