You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/04/14 05:21:09 UTC
kylin git commit: minor, add commit id to diagnosis
Repository: kylin
Updated Branches:
refs/heads/yang-m1 71113643f -> 29240b7db
minor, add commit id to diagnosis
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/29240b7d
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/29240b7d
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/29240b7d
Branch: refs/heads/yang-m1
Commit: 29240b7db310d0e44f930c5afbc92254eb5e850d
Parents: 7111364
Author: lidongsjtu <li...@apache.org>
Authored: Thu Apr 14 11:20:49 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Thu Apr 14 11:20:49 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/common/KylinVersion.java | 24 ++++++++++++++++++++
.../apache/kylin/rest/init/ClientInfoTask.java | 1 +
.../org/apache/kylin/tool/DiagnosisInfoCLI.java | 13 ++++++++++-
3 files changed, 37 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/29240b7d/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 d55f969..91c1958 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
@@ -16,16 +16,23 @@
*/
package org.apache.kylin.common;
+import java.io.File;
import java.util.HashSet;
+import java.util.List;
import java.util.Set;
import javax.annotation.Nullable;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.StringUtils;
+
import com.google.common.base.Preconditions;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
public class KylinVersion {
+ private static final String COMMIT_SHA1 = "commit_SHA1";
public int major;
public int minor;
@@ -121,6 +128,7 @@ public class KylinVersion {
StringBuilder buf = new StringBuilder();
buf.append("kylin.version:").append(KylinVersion.getCurrentVersion()).append("\n");
+ buf.append("commit:").append(getGitCommitInfo());
buf.append("os.name:").append(System.getProperty("os.name")).append("\n");
buf.append("os.arch:").append(System.getProperty("os.arch")).append("\n");
buf.append("os.version:").append(System.getProperty("os.version")).append("\n");
@@ -129,4 +137,20 @@ public class KylinVersion {
return buf.toString();
}
+
+ public static String getGitCommitInfo() {
+ try {
+ File commitFile = new File(KylinConfig.getKylinHome(), COMMIT_SHA1);
+ List<String> lines = FileUtils.readLines(commitFile);
+ StringBuilder sb = new StringBuilder();
+ for (String line : lines) {
+ if (!line.startsWith("#")) {
+ sb.append(line).append("\n");
+ }
+ }
+ return sb.toString();
+ } catch (Exception e) {
+ return StringUtils.EMPTY;
+ }
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/kylin/blob/29240b7d/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java b/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
index 1cf54a3..0fc0e69 100644
--- a/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
+++ b/server/src/main/java/org/apache/kylin/rest/init/ClientInfoTask.java
@@ -38,6 +38,7 @@ public class ClientInfoTask extends InitialTask {
StringBuilder buf = new StringBuilder();
buf.append("kylin.version:").append(KylinVersion.getCurrentVersion()).append("\n");
+ buf.append("commit:").append(KylinVersion.getGitCommitInfo());
buf.append("os.name:").append(System.getProperty("os.name")).append("\n");
buf.append("os.arch:").append(System.getProperty("os.arch")).append("\n");
buf.append("os.version:").append(System.getProperty("os.version")).append("\n");
http://git-wip-us.apache.org/repos/asf/kylin/blob/29240b7d/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
index 5309510..adfd6a4 100644
--- a/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/DiagnosisInfoCLI.java
@@ -133,7 +133,18 @@ public class DiagnosisInfoCLI extends AbstractApplication {
// export conf
if (includeConf) {
logger.info("Start to extract kylin conf files.");
- FileUtils.copyDirectoryToDirectory(new File(getConfFolder()), new File(exportDest));
+ try {
+ FileUtils.copyDirectoryToDirectory(new File(getConfFolder()), new File(exportDest));
+ } catch (Exception e) {
+ logger.warn("Error in export conf.", e);
+ }
+ }
+
+ // export commit id
+ try {
+ FileUtils.copyFileToDirectory(new File(KylinConfig.getKylinHome(), "commit_SHA1"), new File(exportDest));
+ } catch (Exception e) {
+ logger.warn("Error in export commit id.", e);
}
// compress to zip package