Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 185A82009D9 for ; Thu, 19 May 2016 21:47:04 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 16FE8160A1E; Thu, 19 May 2016 19:47:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 37F20160A00 for ; Thu, 19 May 2016 21:47:03 +0200 (CEST) Received: (qmail 49606 invoked by uid 500); 19 May 2016 19:46:51 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 48633 invoked by uid 99); 19 May 2016 19:46:50 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 May 2016 19:46:50 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B44C9E95F8; Thu, 19 May 2016 19:46:50 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Thu, 19 May 2016 19:47:09 -0000 Message-Id: <230877c7def249378dc579bae6ba8001@git.apache.org> In-Reply-To: <25255808f6d94e1e9958e0ef532b7599@git.apache.org> References: <25255808f6d94e1e9958e0ef532b7599@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] hadoop git commit: MAPREDUCE-6701. application master log can not be available when clicking jobhistory's am logs link. Contributed by Haibo Chen archived-at: Thu, 19 May 2016 19:47:04 -0000 MAPREDUCE-6701. application master log can not be available when clicking jobhistory's am logs link. Contributed by Haibo Chen Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/12fa4ec1 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/12fa4ec1 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/12fa4ec1 Branch: refs/heads/HDFS-7240 Commit: 12fa4ec141f8d0cb105b6f60c3739a4b26890fd5 Parents: 4a5819d Author: Jason Lowe Authored: Tue May 17 14:54:13 2016 +0000 Committer: Jason Lowe Committed: Tue May 17 14:54:13 2016 +0000 ---------------------------------------------------------------------- .../hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java | 2 +- .../mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java | 2 +- .../mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java | 12 +++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/12fa4ec1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java index ddac853..13774a8 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/HsJobBlock.java @@ -142,7 +142,7 @@ public class HsJobBlock extends HtmlBlock { td().a(".nodelink", url(MRWebAppUtil.getYARNWebappScheme(), attempt.getNodeHttpAddress()), attempt.getNodeHttpAddress())._(). - td().a(".logslink", url(attempt.getShortLogsLink()), + td().a(".logslink", url(attempt.getLogsLink()), "logs")._(). _(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/12fa4ec1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java index 065f8c7..54383df 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/webapp/dao/AMAttemptInfo.java @@ -68,7 +68,7 @@ public class AMAttemptInfo { if (containerId != null) { this.containerId = containerId.toString(); this.logsLink = join(host, pathPrefix, - ujoin("logs", this.nodeHttpAddress, this.containerId, jobId, user)); + ujoin("logs", this.nodeId, this.containerId, jobId, user)); this.shortLogsLink = ujoin("logs", this.nodeHttpAddress, this.containerId, jobId, user); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/12fa4ec1/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java index fc67c1f..4c4088f 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/webapp/TestHsWebServicesJobs.java @@ -766,6 +766,7 @@ public class TestHsWebServicesJobs extends JerseyTest { for (int i = 0; i < attempts.length(); i++) { JSONObject attempt = attempts.getJSONObject(i); verifyHsJobAttemptsGeneric(job, attempt.getString("nodeHttpAddress"), + attempt.getString("nodeId"), attempt.getInt("id"), attempt.getLong("startTime"), attempt.getString("containerId"), attempt.getString("logsLink")); @@ -779,6 +780,7 @@ public class TestHsWebServicesJobs extends JerseyTest { Element element = (Element) nodes.item(i); verifyHsJobAttemptsGeneric(job, WebServicesTestUtils.getXmlString(element, "nodeHttpAddress"), + WebServicesTestUtils.getXmlString(element, "nodeId"), WebServicesTestUtils.getXmlInt(element, "id"), WebServicesTestUtils.getXmlLong(element, "startTime"), WebServicesTestUtils.getXmlString(element, "containerId"), @@ -787,7 +789,8 @@ public class TestHsWebServicesJobs extends JerseyTest { } public void verifyHsJobAttemptsGeneric(Job job, String nodeHttpAddress, - int id, long startTime, String containerId, String logsLink) { + String nodeId, int id, long startTime, String containerId, + String logsLink) { boolean attemptFound = false; for (AMInfo amInfo : job.getAMInfos()) { if (amInfo.getAppAttemptId().getAttemptId() == id) { @@ -801,10 +804,9 @@ public class TestHsWebServicesJobs extends JerseyTest { WebServicesTestUtils.checkStringMatch("containerId", amInfo .getContainerId().toString(), containerId); - String localLogsLink = join( - "hsmockwebapp", - ujoin("logs", nodeHttpAddress, containerId, - MRApps.toString(job.getID()), job.getUserName())); + String localLogsLink = join("hsmockwebapp", + ujoin("logs", nodeId, containerId, MRApps.toString(job.getID()), + job.getUserName())); assertTrue("logsLink", logsLink.contains(localLogsLink)); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org