Skip to content

[SPARK-12399] Display correct error message when accessing REST API with an unknown app Id #10352

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

[SPARK-12399] Display correct error message when accessing REST API with an unknown app Id #10352

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7721af
Display correct error message when accessing REST API with an unknown…
carsonwang Dec 17, 2015
e926120
Use NonFatal
carsonwang Dec 17, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/history/HistoryServer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import java.util.NoSuchElementException
import java.util.zip.ZipOutputStream
import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse}

import scala.util.control.NonFatal

import com.google.common.cache._
import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}

Expand Down Expand Up @@ -115,7 +117,17 @@ class HistoryServer(
}

Copy link
Contributor

@andrewor14 andrewor14 Dec 19, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it a better fix to do appCache.getIfPresent here?

Copy link
Contributor Author

@carsonwang carsonwang Dec 21, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

appCache.getIfPresent returns null if there is no cached value for the appKey. But appCache.get will try to obtain that value from a CacheLoader, cache it and return it. So I think we still need use appCache.get here and handle the exception.

def getSparkUI(appKey: String): Option[SparkUI] = {
Option(appCache.get(appKey))
try {
val ui = appCache.get(appKey)
Some(ui)
} catch {
case NonFatal(e) => e.getCause() match {
case nsee: NoSuchElementException =>
None

case cause: Exception => throw cause
}
}
}

initialize()
Expand Down Expand Up @@ -195,7 +207,7 @@ class HistoryServer(
appCache.get(appId + attemptId.map { id => s"/$id" }.getOrElse(""))
true
} catch {
case e: Exception => e.getCause() match {
case NonFatal(e) => e.getCause() match {
case nsee: NoSuchElementException =>
false

Expand Down