| commit | 6b20b8c2cbb16f005df7b09958df2d4455f740c8 | [log] [tgz] |
|---|---|---|
| author | Wangda Tan <wangda@apache.org> | Sun Oct 30 13:19:15 2016 -0700 |
| committer | Wangda Tan <wangda@apache.org> | Sun Oct 30 13:20:24 2016 -0700 |
| tree | 175c31f5a9dc961ce2a3b7fa42fd0dc081ba9bfa | |
| parent | 26b8689df8acb5f7c521624db7d80b04ad1c05c2 [diff] |
YARN-5804. New UI2 is not able to launch with jetty 9 upgrade post HADOOP-10075. (Sunil G via wangda) (cherry picked from commit ddebaa6b7ae1031899139d153d57df5387d60542)
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java index d3b37d9..7ce0dfa 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/WebApps.java
@@ -43,7 +43,7 @@ import org.apache.hadoop.security.http.XFrameOptionsFilter; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.webapp.WebAppContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -377,7 +377,7 @@ WebApp webApp = build(webapp); HttpServer2 httpServer = webApp.httpServer(); if (ui2Context != null) { - httpServer.addContext(ui2Context, true); + httpServer.addHandlerAtFront(ui2Context); } try { httpServer.start();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 4c0a3bb..03daeb9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java
@@ -115,7 +115,7 @@ import org.apache.hadoop.yarn.webapp.WebApps.Builder; import org.apache.hadoop.yarn.webapp.util.WebAppUtils; import org.apache.zookeeper.server.auth.DigestAuthenticationProvider; -import org.mortbay.jetty.webapp.WebAppContext; +import org.eclipse.jetty.webapp.WebAppContext; import com.google.common.annotations.VisibleForTesting; import java.io.IOException;