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/05/27 06:34:55 UTC
[30/50] [abbrv] incubator-kylin git commit: KYLIN-757 Broadcast cube
event to cluster
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/c484c209
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/c484c209
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/c484c209
Branch: refs/heads/0.8.0
Commit: c484c209d7c712086eb0d15cc239632c3e0efb32
Parents: b92892c
Author: Shao Feng, Shi <sh...@ebay.com>
Authored: Tue May 12 14:32:46 2015 +0800
Committer: shaofengshi <sh...@apache.org>
Committed: Wed May 27 12:24:38 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/c484c209/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 e9677fb..cbb049d 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;
@@ -427,10 +428,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);
}
/**
@@ -495,6 +493,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);
@@ -514,7 +521,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/c484c209/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 fa379dc..065b64b 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;
@@ -57,6 +58,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));