aboutsummaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorbomeng <bmeng@us.ibm.com>2016-06-03 09:59:15 -0700
committerMarcelo Vanzin <vanzin@cloudera.com>2016-06-03 09:59:15 -0700
commit8fa00dd05f3b5e78e9268715b0f05f9f739eca5c (patch)
treee0fcc50dd3617b834ae0bcccbaa281daf146dfb4 /core/src
parentc2f0cb4f6380c500f9ba37b2429503b762204973 (diff)
downloadspark-8fa00dd05f3b5e78e9268715b0f05f9f739eca5c.tar.gz
spark-8fa00dd05f3b5e78e9268715b0f05f9f739eca5c.tar.bz2
spark-8fa00dd05f3b5e78e9268715b0f05f9f739eca5c.zip
[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 <bmeng@us.ibm.com> Closes #13475 from bomeng/SPARK-15737.
Diffstat (limited to 'core/src')
-rw-r--r--core/src/main/scala/org/apache/spark/deploy/rest/RestSubmissionServer.scala1
-rw-r--r--core/src/main/scala/org/apache/spark/ui/JettyUtils.scala1
2 files changed, 2 insertions, 0 deletions
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 7e93bfc45e..fa55d47084 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)
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 6854f7baf7..50283f2b74 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 {