Repository: spark Updated Branches: refs/heads/branch-2.0 deda53a9e -> da29762f1
[SPARK-15737][CORE] fix jetty warning ## What changes were proposed in this pull request? After upgrading Jetty to 9.2, we always see "WARN org.eclipse.jetty.server.handler.AbstractHandler: No Server set for org.eclipse.jetty.server.handler.ErrorHandler" while running any test cases. This PR will fix it. ## How was this patch tested? The existing test cases will cover it. Author: bomeng <bm...@us.ibm.com> Closes #13475 from bomeng/SPARK-15737. (cherry picked from commit 8fa00dd05f3b5e78e9268715b0f05f9f739eca5c) Signed-off-by: Marcelo Vanzin <van...@cloudera.com> Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/da29762f Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/da29762f Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/da29762f Branch: refs/heads/branch-2.0 Commit: da29762f1f9df028886d741c66f601d70e797ee3 Parents: deda53a Author: bomeng <bm...@us.ibm.com> Authored: Fri Jun 3 09:59:15 2016 -0700 Committer: Marcelo Vanzin <van...@cloudera.com> Committed: Fri Jun 3 09:59:29 2016 -0700 ---------------------------------------------------------------------- .../scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala | 1 + core/src/main/scala/org/apache/spark/ui/JettyUtils.scala | 1 + 2 files changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/da29762f/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala index 7e93bfc..fa55d47 100644 --- a/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala +++ b/core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala @@ -89,6 +89,7 @@ private[spark] abstract class RestSubmissionServer( server.addConnector(connector) val mainHandler = new ServletContextHandler + mainHandler.setServer(server) mainHandler.setContextPath("/") contextToServlet.foreach { case (prefix, servlet) => mainHandler.addServlet(new ServletHolder(servlet), prefix) http://git-wip-us.apache.org/repos/asf/spark/blob/da29762f/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala ---------------------------------------------------------------------- diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala index 6854f7b..50283f2 100644 --- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala +++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala @@ -291,6 +291,7 @@ private[spark] object JettyUtils extends Logging { val errorHandler = new ErrorHandler() errorHandler.setShowStacks(true) + errorHandler.setServer(server) server.addBean(errorHandler) server.setHandler(collection) try { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org
