Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2BED217BD0 for ; Fri, 27 Mar 2015 00:57:27 +0000 (UTC) Received: (qmail 17202 invoked by uid 500); 27 Mar 2015 00:57:20 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 17101 invoked by uid 500); 27 Mar 2015 00:57:20 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 15641 invoked by uid 99); 27 Mar 2015 00:57:20 -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; Fri, 27 Mar 2015 00:57:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C26C3E2F3F; Fri, 27 Mar 2015 00:57:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sseth@apache.org To: commits@tez.apache.org Date: Fri, 27 Mar 2015 00:57:50 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [32/52] [abbrv] tez git commit: TEZ-2047. Build fails against hadoop-2.2 post TEZ-2018 (pramachandran) TEZ-2047. Build fails against hadoop-2.2 post TEZ-2018 (pramachandran) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/d1b4bd47 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/d1b4bd47 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/d1b4bd47 Branch: refs/heads/TEZ-2003 Commit: d1b4bd47c5709fbd64b5b0b10c9ed876c35c936a Parents: 60ddcba Author: Prakash Ramachandran Authored: Wed Mar 25 19:08:37 2015 +0530 Committer: Prakash Ramachandran Committed: Wed Mar 25 19:08:37 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../main/java/org/apache/tez/dag/app/web/WebUIService.java | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/d1b4bd47/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 238496b..f17c7dc 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -90,6 +90,7 @@ Release 0.6.1: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-2047. Build fails against hadoop-2.2 post TEZ-2018 TEZ-2064. SessionNotRunning Exception not thrown is all cases TEZ-2189. Tez UI live AM tracking url only works for localhost addresses TEZ-2179. Timeline relatedentries missing cause exaggerated warning. http://git-wip-us.apache.org/repos/asf/tez/blob/d1b4bd47/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java b/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java index acb2d63..4f2fec0 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/web/WebUIService.java @@ -27,7 +27,6 @@ import com.google.inject.name.Names; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.http.HttpConfig; import org.apache.hadoop.net.NetUtils; import org.apache.hadoop.service.AbstractService; import org.apache.hadoop.yarn.webapp.WebApp; @@ -57,6 +56,7 @@ public class WebUIService extends AbstractService { @Override protected void serviceInit(Configuration conf) throws Exception { + Configuration config = new Configuration(conf); if (historyUrl == null || historyUrl.isEmpty()) { LOG.error("Tez UI History URL is not set"); } else { @@ -66,24 +66,25 @@ public class WebUIService extends AbstractService { if (tezAMWebApp != null) { this.tezAMWebApp.setHistoryUrl(historyUrl); } - super.serviceInit(conf); + super.serviceInit(config); } @Override protected void serviceStart() throws Exception { if (tezAMWebApp != null) { // use AmIpFilter to restrict connections only from the rm proxy - final Configuration conf = getConfig(); + Configuration conf = getConfig(); conf.set("hadoop.http.filter.initializers", "org.apache.hadoop.yarn.server.webproxy.amfilter.AmFilterInitializer"); try { // Explicitly disabling SSL for the web service. For https we do not want AM users to allow // access to the keystore file for opening SSL listener. We can trust RM/NM to issue SSL // certificates, however AM user is not trusted. + // ideally the withHttpPolicy should be used, however hadoop 2.2 does not have the api + conf.set("yarn.http.policy", "HTTP_ONLY"); this.webApp = WebApps .$for(this.tezAMWebApp) .with(conf) - .withHttpPolicy(conf, HttpConfig.Policy.HTTP_ONLY) .start(this.tezAMWebApp); InetSocketAddress address = webApp.getListenerAddress(); if (address != null) {