Repository: kylin Updated Branches: refs/heads/yang21-cdh5.7 d5efd44c0 -> da1449262 (forced update)
minor, retry when http failed in job diagnosis Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/7478d1b6 Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/7478d1b6 Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/7478d1b6 Branch: refs/heads/yang21-cdh5.7 Commit: 7478d1b6a116d3cb24301b272197b60294f2bb15 Parents: e10f2b9 Author: lidongsjtu <lid...@apache.org> Authored: Thu Sep 29 09:48:58 2016 +0800 Committer: lidongsjtu <lid...@apache.org> Committed: Thu Sep 29 17:11:09 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java | 4 ++-- .../java/org/apache/kylin/tool/JobTaskCounterExtractor.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/7478d1b6/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 635a2c3..c8ff1f4 100644 --- a/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java +++ b/tool/src/main/java/org/apache/kylin/tool/JobDiagnosisInfoCLI.java @@ -99,8 +99,8 @@ public class JobDiagnosisInfoCLI extends AbstractInfoExtractor { addRequired(ResourceStore.EXECUTE_RESOURCE_ROOT + "/" + jobId); addRequired(ResourceStore.EXECUTE_OUTPUT_RESOURCE_ROOT + "/" + jobId); for (ExecutablePO task : executablePO.getTasks()) { - addRequired(ResourceStore.EXECUTE_RESOURCE_ROOT + "/" + executablePO.getTasks()); - addRequired(ResourceStore.EXECUTE_OUTPUT_RESOURCE_ROOT + "/" + executablePO.getTasks()); + addRequired(ResourceStore.EXECUTE_RESOURCE_ROOT + "/" + task.getUuid()); + addRequired(ResourceStore.EXECUTE_OUTPUT_RESOURCE_ROOT + "/" + task.getUuid()); if (includeYarnLogs) { yarnLogsResources.add(task.getUuid()); } http://git-wip-us.apache.org/repos/asf/kylin/blob/7478d1b6/tool/src/main/java/org/apache/kylin/tool/JobTaskCounterExtractor.java ---------------------------------------------------------------------- diff --git a/tool/src/main/java/org/apache/kylin/tool/JobTaskCounterExtractor.java b/tool/src/main/java/org/apache/kylin/tool/JobTaskCounterExtractor.java index 7b9d8f3..6a317e9 100644 --- a/tool/src/main/java/org/apache/kylin/tool/JobTaskCounterExtractor.java +++ b/tool/src/main/java/org/apache/kylin/tool/JobTaskCounterExtractor.java @@ -47,6 +47,8 @@ public class JobTaskCounterExtractor extends AbstractInfoExtractor { private String yarnUrl; private static final Logger logger = LoggerFactory.getLogger(JobTaskCounterExtractor.class); + private final int HTTP_RETRY = 3; + public JobTaskCounterExtractor(String mrJobId) { this.mrJobId = mrJobId; this.yarnUrl = getRestCheckUrl(); @@ -87,14 +89,17 @@ public class JobTaskCounterExtractor extends AbstractInfoExtractor { private String getHttpResponse(String url) { HttpClient client = new HttpClient(); String response = null; - while (response == null) { + int retry_times = 0; + while (response == null && retry_times < HTTP_RETRY) { + retry_times++; + HttpMethod get = new GetMethod(url); try { get.addRequestHeader("accept", "application/json"); client.executeMethod(get); response = get.getResponseBodyAsString(); } catch (Exception e) { - logger.warn("Failed to fetch http response" + e); + logger.warn("Failed to fetch http response. Retry={}", retry_times, e); } finally { get.releaseConnection(); }