Skip to content

[SPARK-17243] [Web UI] Spark 2.0 History Server won't load with very large application history #14835

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
ajbozarth wants to merge 7 commits into from
Closed

[SPARK-17243] [Web UI] Spark 2.0 History Server won't load with very large application history #14835

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9bcb02d
Added limit param to applications list api and maxApplications conf t…
ajbozarth Aug 26, 2016
fab32f9
Switched to use ConfigBuilder
ajbozarth Aug 26, 2016
6163f13
Added tests and fixed a typos
ajbozarth Aug 26, 2016
172dc56
Switched to js solution and updated docs
ajbozarth Aug 26, 2016
bbb9718
Fixed some wording in the docs
ajbozarth Aug 29, 2016
aa1c6f9
Merge branch 'master' into spark17243
ajbozarth Aug 30, 2016
8da22e3
updated doc wording
ajbozarth Aug 30, 2016
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
6 changes: 5 additions & 1 deletion 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 @@ -28,6 +28,7 @@ import org.eclipse.jetty.servlet.{ServletContextHandler, ServletHolder}
import org.apache.spark.{SecurityManager, SparkConf}
import org.apache.spark.deploy.SparkHadoopUtil
import org.apache.spark.internal.Logging
import org.apache.spark.internal.config._
import org.apache.spark.status.api.v1.{ApiRootResource, ApplicationInfo, ApplicationsListResource, UIRoot}
import org.apache.spark.ui.{SparkUI, UIUtils, WebUI}
import org.apache.spark.ui.JettyUtils._
Expand Down Expand Up @@ -55,6 +56,9 @@ class HistoryServer(
// How many applications to retain
private val retainedApplications = conf.getInt("spark.history.retainedApplications", 50)

// How many applications are available
private val maxApplications = conf.get(HISTORY_MAX_APPS);

// application
private val appCache = new ApplicationCache(this, retainedApplications, new SystemClock())

Expand Down Expand Up @@ -171,7 +175,7 @@ class HistoryServer(
* @return List of all known applications.
*/
def getApplicationList(): Iterable[ApplicationHistoryInfo] = {
provider.getListing()
provider.getListing().take(maxApplications)
}

def getApplicationInfoList: Iterator[ApplicationInfo] = {
Expand Down
4 changes: 4 additions & 0 deletions core/src/main/scala/org/apache/spark/internal/config/package.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,4 +119,8 @@ package object config {
private[spark] val UI_RETAINED_TASKS = ConfigBuilder("spark.ui.retainedTasks")
.intConf
.createWithDefault(100000)

// To limit how many applications are available in the History Server
private[spark] val HISTORY_MAX_APPS =
ConfigBuilder("spark.history.maxApplications").intConf.createWithDefault(Integer.MAX_VALUE)
}
10 changes: 8 additions & 2 deletions core/src/main/scala/org/apache/spark/status/api/v1/ApplicationListResource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ private[v1] class ApplicationListResource(uiRoot: UIRoot) {
def appList(
@QueryParam("status") status: JList[ApplicationStatus],
@DefaultValue("2010-01-01") @QueryParam("minDate") minDate: SimpleDateParam,
@DefaultValue("3000-01-01") @QueryParam("maxDate") maxDate: SimpleDateParam)
@DefaultValue("3000-01-01") @QueryParam("maxDate") maxDate: SimpleDateParam,
@QueryParam("limit") limit: Integer)
: Iterator[ApplicationInfo] = {
val allApps = uiRoot.getApplicationInfoList
val adjStatus = {
Expand All @@ -41,7 +42,7 @@ private[v1] class ApplicationListResource(uiRoot: UIRoot) {
}
val includeCompleted = adjStatus.contains(ApplicationStatus.COMPLETED)
val includeRunning = adjStatus.contains(ApplicationStatus.RUNNING)
allApps.filter { app =>
val appList = allApps.filter { app =>
val anyRunning = app.attempts.exists(!_.completed)
// if any attempt is still running, we consider the app to also still be running
val statusOk = (!anyRunning && includeCompleted) ||
Expand All @@ -53,6 +54,11 @@ private[v1] class ApplicationListResource(uiRoot: UIRoot) {
}
statusOk && dateOk
}
if (limit != null) {
appList.take(limit)
} else {
appList
}
}
}

Expand Down
67 changes: 67 additions & 0 deletions core/src/test/resources/HistoryServerExpectations/limit_app_list_json_expectation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
[ {
"id" : "local-1430917381534",
"name" : "Spark shell",
"attempts" : [ {
"startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:11.398GMT",
"lastUpdated" : "",
"duration" : 10505,
"sparkUser" : "irashid",
"completed" : true,
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917391398,
"lastUpdatedEpoch" : 0
} ]
}, {
"id" : "local-1430917381535",
"name" : "Spark shell",
"attempts" : [ {
"attemptId" : "2",
"startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:00.950GMT",
"lastUpdated" : "",
"duration" : 57,
"sparkUser" : "irashid",
"completed" : true,
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917380950,
"lastUpdatedEpoch" : 0
}, {
"attemptId" : "1",
"startTime" : "2015-05-06T13:03:00.880GMT",
"endTime" : "2015-05-06T13:03:00.890GMT",
"lastUpdated" : "",
"duration" : 10,
"sparkUser" : "irashid",
"completed" : true,
"startTimeEpoch" : 1430917380880,
"endTimeEpoch" : 1430917380890,
"lastUpdatedEpoch" : 0
} ]
}, {
"id" : "local-1426533911241",
"name" : "Spark shell",
"attempts" : [ {
"attemptId" : "2",
"startTime" : "2015-03-17T23:11:50.242GMT",
"endTime" : "2015-03-17T23:12:25.177GMT",
"lastUpdated" : "",
"duration" : 34935,
"sparkUser" : "irashid",
"completed" : true,
"startTimeEpoch" : 1426633910242,
"endTimeEpoch" : 1426633945177,
"lastUpdatedEpoch" : 0
}, {
"attemptId" : "1",
"startTime" : "2015-03-16T19:25:10.242GMT",
"endTime" : "2015-03-16T19:25:45.177GMT",
"lastUpdated" : "",
"duration" : 34935,
"sparkUser" : "irashid",
"completed" : true,
"startTimeEpoch" : 1426533910242,
"endTimeEpoch" : 1426533945177,
"lastUpdatedEpoch" : 0
} ]
} ]
1 change: 1 addition & 0 deletions core/src/test/scala/org/apache/spark/deploy/history/HistoryServerSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ class HistoryServerSuite extends SparkFunSuite with BeforeAndAfter with Matchers
"minDate app list json" -> "applications?minDate=2015-02-10",
"maxDate app list json" -> "applications?maxDate=2015-02-10",
"maxDate2 app list json" -> "applications?maxDate=2015-02-03T16:42:40.000GMT",
"limit app list json" -> "applications?limit=3",
Copy link
Contributor

@tgravescs tgravescs Aug 29, 2016

Choose a reason for hiding this comment

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

what happens with limit=-1? I assume the take will just return empty map but good to try it.

Copy link
Member Author

@ajbozarth ajbozarth Aug 29, 2016

Choose a reason for hiding this comment

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

limit=-1 will actually return the whole list, I just pass the int to take and that's how that function works, I though this was a good default value (which is why it's the default value in the js file)

Copy link
Contributor

@tgravescs tgravescs Aug 29, 2016

Choose a reason for hiding this comment

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

ok, sounds fine.

Copy link
Contributor

@steveloughran steveloughran Aug 30, 2016

Choose a reason for hiding this comment

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

I was worried about what would happen if limit was unset —but the existing tests (lines 180-182) all test that

"one app json" -> "applications/local-1422981780767",
"one app multi-attempt json" -> "applications/local-1426533911241",
"job list json" -> "applications/local-1422981780767/jobs",
Expand Down
1 change: 1 addition & 0 deletions dev/.rat-excludes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,4 @@ org.apache.spark.scheduler.ExternalClusterManager
.*\.sql
.Rbuildignore
org.apache.spark.deploy.yarn.security.ServiceCredentialProvider
spark-warehouse
Copy link
Contributor

@steveloughran steveloughran Aug 26, 2016

Choose a reason for hiding this comment

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

not sure about this change

Copy link
Member Author

@ajbozarth ajbozarth Aug 26, 2016

Choose a reason for hiding this comment

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

oh whoops, I must of committed that by accident, dev/run-tests won't pass without it so I've been adding/removing it every time