Repository: kylin Updated Branches: refs/heads/KYLIN-2314 590fb71ea -> b7889102a
tolerate missing kafak consumer properties Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/b7889102 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/b7889102 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/b7889102 Branch: refs/heads/KYLIN-2314 Commit: b7889102a7ff431ff0ac34d65e148bc37dd1b82a Parents: 590fb71 Author: Yang Li <[email protected]> Authored: Sun Dec 25 07:47:41 2016 +0800 Committer: Yang Li <[email protected]> Committed: Sun Dec 25 07:47:41 2016 +0800 ---------------------------------------------------------------------- .../kylin/source/kafka/config/KafkaConsumerProperties.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/b7889102/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java ---------------------------------------------------------------------- diff --git a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java index 8f0dd42..5b3dd87 100644 --- a/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java +++ b/source-kafka/src/main/java/org/apache/kylin/source/kafka/config/KafkaConsumerProperties.java @@ -101,8 +101,8 @@ public class KafkaConsumerProperties { private Properties loadKafkaConsumerProperties() { File propFile = getKafkaConsumerFile(); if (propFile == null || !propFile.exists()) { - logger.error("fail to locate " + KAFKA_CONSUMER_FILE); - throw new RuntimeException("fail to locate " + KAFKA_CONSUMER_FILE); + logger.warn("fail to locate " + KAFKA_CONSUMER_FILE + ", use empty kafka consumer properties"); + return new Properties(); } Properties properties = new Properties(); try { @@ -115,7 +115,6 @@ public class KafkaConsumerProperties { File propOverrideFile = new File(propFile.getParentFile(), propFile.getName() + ".override"); if (propOverrideFile.exists()) { FileInputStream ois = new FileInputStream(propOverrideFile); - Properties propOverride = new Properties(); Configuration oconf = new Configuration(); oconf.addResource(ois); properties.putAll(extractKafkaConfigToProperties(oconf)); @@ -134,7 +133,6 @@ public class KafkaConsumerProperties { } private File getKafkaConsumerFile() { - KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); String kylinConfHome = System.getProperty(KylinConfig.KYLIN_CONF); if (!StringUtils.isEmpty(kylinConfHome)) { logger.info("Use KYLIN_CONF=" + kylinConfHome); @@ -143,7 +141,7 @@ public class KafkaConsumerProperties { logger.warn("KYLIN_CONF property was not set, will seek KYLIN_HOME env variable"); - String kylinHome = kylinConfig.getKylinHome(); + String kylinHome = KylinConfig.getKylinHome(); if (StringUtils.isEmpty(kylinHome)) throw new KylinConfigCannotInitException("Didn't find KYLIN_CONF or KYLIN_HOME, please set one of them");
