tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prak...@apache.org
Subject tez git commit: TEZ-2047. Build fails against hadoop-2.2 post TEZ-2018 (pramachandran)
Date Wed, 25 Mar 2015 13:43:37 GMT
Repository: tez
Updated Branches:
  refs/heads/master 60ddcba5e -> d1b4bd47c


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/master
Commit: d1b4bd47c5709fbd64b5b0b10c9ed876c35c936a
Parents: 60ddcba
Author: Prakash Ramachandran <pramachandran@hortonworks.com>
Authored: Wed Mar 25 19:08:37 2015 +0530
Committer: Prakash Ramachandran <pramachandran@hortonworks.com>
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) {


Mime
View raw message