Repository: kylin Updated Branches: refs/heads/master 99f766615 -> 8d16bb3a4
KYLIN-1614 Backward compatible of diagnosis tool Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/8d16bb3a Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/8d16bb3a Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/8d16bb3a Branch: refs/heads/master Commit: 8d16bb3a444e673fa0527d19ca88bbf00331142b Parents: 99f7666 Author: lidongsjtu <lid...@apache.org> Authored: Thu May 5 15:38:18 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Thu May 5 15:38:39 2016 +0800 ---------------------------------------------------------------------- .../main/java/org/apache/kylin/common/KylinVersion.java | 8 ++++++-- .../java/org/apache/kylin/tool/AbstractInfoExtractor.java | 8 ++++++-- .../java/org/apache/kylin/tool/CubeMetaExtractor.java | 10 ++++++---- 3 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/8d16bb3a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java ---------------------------------------------------------------------- diff --git a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java index d1d2f7a..51fc806 100644 --- a/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java +++ b/core-common/src/main/java/org/apache/kylin/common/KylinVersion.java @@ -31,7 +31,8 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; public class KylinVersion { - private static final String COMMIT_SHA1 = "commit_SHA1"; + private static final String COMMIT_SHA1_v15 = "commit_SHA1"; + private static final String COMMIT_SHA1_v13 = "commit.sha1"; public int major; public int minor; @@ -140,7 +141,10 @@ public class KylinVersion { public static String getGitCommitInfo() { try { - File commitFile = new File(KylinConfig.getKylinHome(), COMMIT_SHA1); + File commitFile = new File(KylinConfig.getKylinHome(), COMMIT_SHA1_v15); + if (!commitFile.exists()) { + commitFile = new File(KylinConfig.getKylinHome(), COMMIT_SHA1_v13); + } List<String> lines = FileUtils.readLines(commitFile); StringBuilder sb = new StringBuilder(); for (String line : lines) { http://git-wip-us.apache.org/repos/asf/kylin/blob/8d16bb3a/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java b/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java index 498baaf..0706143 100644 --- a/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java +++ b/tool/src/main/java/org/apache/kylin/tool/AbstractInfoExtractor.java @@ -50,7 +50,7 @@ public abstract class AbstractInfoExtractor extends AbstractApplication { private static final Option OPTION_SUBMODULE = OptionBuilder.withArgName("submodule").hasArg().isRequired(false).withDescription("specify whether this is a submodule of other CLI tool").create("submodule"); private static final String DEFAULT_PACKAGE_TYPE = "base"; - private static final String COMMIT_SHA1_FILE = "commit_SHA1"; + private static final String[] COMMIT_SHA1_FILES = {"commit_SHA1", "commit.sha1"}; protected final Options options; @@ -120,7 +120,11 @@ public abstract class AbstractInfoExtractor extends AbstractApplication { private void dumpBasicDiagInfo() throws IOException { try { - FileUtils.copyFileToDirectory(new File(KylinConfig.getKylinHome(), COMMIT_SHA1_FILE), exportDir); + for (String commitSHA1File : COMMIT_SHA1_FILES) { + if (new File(commitSHA1File).exists()) { + FileUtils.copyFileToDirectory(new File(KylinConfig.getKylinHome(), commitSHA1File), exportDir); + } + } } catch (IOException e) { logger.warn("Failed to copy commit_SHA1 file.", e); } http://git-wip-us.apache.org/repos/asf/kylin/blob/8d16bb3a/tool/src/main/java/org/apache/kylin/tool/CubeMetaExtractor.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/CubeMetaExtractor.java b/tool/src/main/java/org/apache/kylin/tool/CubeMetaExtractor.java index 28f5e70..176a1d5 100644 --- a/tool/src/main/java/org/apache/kylin/tool/CubeMetaExtractor.java +++ b/tool/src/main/java/org/apache/kylin/tool/CubeMetaExtractor.java @@ -88,7 +88,6 @@ public class CubeMetaExtractor extends AbstractInfoExtractor { private HybridManager hybridManager; private CubeManager cubeManager; private StreamingManager streamingManager; - private KafkaConfigManager kafkaConfigManager; private CubeDescManager cubeDescManager; private ExecutableDao executableDao; private RealizationRegistry realizationRegistry; @@ -131,8 +130,6 @@ public class CubeMetaExtractor extends AbstractInfoExtractor { hybridManager = HybridManager.getInstance(kylinConfig); cubeManager = CubeManager.getInstance(kylinConfig); cubeDescManager = CubeDescManager.getInstance(kylinConfig); - streamingManager = StreamingManager.getInstance(kylinConfig); - kafkaConfigManager = KafkaConfigManager.getInstance(kylinConfig); executableDao = ExecutableDao.getInstance(kylinConfig); realizationRegistry = RealizationRegistry.getInstance(kylinConfig); badQueryHistoryManager = BadQueryHistoryManager.getInstance(kylinConfig); @@ -217,6 +214,7 @@ public class CubeMetaExtractor extends AbstractInfoExtractor { } private void dealWithStreaming(CubeInstance cube) { + streamingManager = StreamingManager.getInstance(kylinConfig); for (StreamingConfig streamingConfig : streamingManager.listAllStreaming()) { if (streamingConfig.getName() != null && streamingConfig.getName().equalsIgnoreCase(cube.getFactTable())) { addRequired(StreamingConfig.concatResourcePath(streamingConfig.getName())); @@ -236,7 +234,11 @@ public class CubeMetaExtractor extends AbstractInfoExtractor { String modelName = cubeDesc.getModelName(); DataModelDesc modelDesc = metadataManager.getDataModelDesc(modelName); - dealWithStreaming(cube); + try { + dealWithStreaming(cube); + } catch (Exception e) { + logger.warn("Failed to deal with streaming.", e); + } for (String tableName : modelDesc.getAllTables()) { addRequired(TableDesc.concatResourcePath(tableName));
