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/06/01 07:12:43 UTC
kylin git commit: minor, add conf for job diagnosis
Repository: kylin
Updated Branches:
refs/heads/master 5ab419449 -> 669916eff
minor, add conf for job diagnosis
Signed-off-by: lidongsjtu <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/669916ef
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/669916ef
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/669916ef
Branch: refs/heads/master
Commit: 669916eff7f56c3316f20d00072644d0b66b8da3
Parents: 5ab4194
Author: Lingyan Jiang <ly...@hotmail.com>
Authored: Wed Jun 1 14:40:10 2016 +0800
Committer: lidongsjtu <li...@apache.org>
Committed: Wed Jun 1 15:12:38 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/tool/JobDiagnosisInfoCLI.java | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/669916ef/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
----------------------------------------------------------------------
diff --git a/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java b/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
index 4dab057..7ed59b0 100644
--- a/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
+++ b/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java
@@ -30,6 +30,7 @@ import org.apache.kylin.job.constant.ExecutableConstants;
import org.apache.kylin.job.dao.ExecutableDao;
import org.apache.kylin.job.dao.ExecutablePO;
import org.apache.kylin.tool.util.ResourceStoreUtil;
+import org.apache.kylin.tool.util.ToolUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,6 +54,10 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
@SuppressWarnings("static-access")
private static final Option OPTION_INCLUDE_CLIENT = OptionBuilder.withArgName("includeClient").hasArg().isRequired(false).withDescription("Specify whether to include client info to extract. Default true.").create("includeClient");
+
+ @SuppressWarnings("static-access")
+ private static final Option OPTION_INCLUDE_CONF = OptionBuilder.withArgName("includeConf").hasArg().isRequired(false).withDescription("Specify whether to include conf files to extract. Default true.").create("includeConf");
+
List<String> requiredResources = Lists.newArrayList();
List<String> yarnLogsResources = Lists.newArrayList();
private KylinConfig kylinConfig;
@@ -67,6 +72,7 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
options.addOption(OPTION_INCLUDE_CUBE);
options.addOption(OPTION_INCLUDE_CLIENT);
options.addOption(OPTION_INCLUDE_YARN_LOGS);
+ options.addOption(OPTION_INCLUDE_CONF);
kylinConfig = KylinConfig.getInstanceFromEnv();
executableDao = ExecutableDao.getInstance(kylinConfig);
@@ -83,6 +89,7 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
boolean includeCube = optionsHelper.hasOption(OPTION_INCLUDE_CUBE) ? Boolean.valueOf(optionsHelper.getOptionValue(OPTION_INCLUDE_CUBE)) : true;
boolean includeYarnLogs = optionsHelper.hasOption(OPTION_INCLUDE_YARN_LOGS) ? Boolean.valueOf(optionsHelper.getOptionValue(OPTION_INCLUDE_YARN_LOGS)) : true;
boolean includeClient = optionsHelper.hasOption(OPTION_INCLUDE_CLIENT) ? Boolean.valueOf(optionsHelper.getOptionValue(OPTION_INCLUDE_CLIENT)) : true;
+ boolean includeConf = optionsHelper.hasOption(OPTION_INCLUDE_CONF) ? Boolean.valueOf(optionsHelper.getOptionValue(OPTION_INCLUDE_CONF)) : true;
// dump job output
logger.info("Start to dump job output");
@@ -130,6 +137,16 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor {
clientEnvExtractor.execute(clientArgs);
}
+ // export conf
+ if (includeConf) {
+ logger.info("Start to extract kylin conf files.");
+ try {
+ FileUtils.copyDirectoryToDirectory(new File(ToolUtil.getConfFolder()), exportDir);
+ } catch (Exception e) {
+ logger.warn("Error in export conf.", e);
+ }
+ }
+
// export kylin logs
String[] logsArgs = { "-destDir", new File(exportDir, "logs").getAbsolutePath(), "-compress", "false", "-submodule", "true" };
KylinLogExtractor logExtractor = new KylinLogExtractor();