You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2018/01/19 14:22:28 UTC
spark git commit: [SPARK-23024][WEB-UI] Spark ui about the contents
of the form need to have hidden and show features,
when the table records very much.
Repository: spark
Updated Branches:
refs/heads/master e41400c3c -> e1c33b6cd
[SPARK-23024][WEB-UI] Spark ui about the contents of the form need to have hidden and show features, when the table records very much.
## What changes were proposed in this pull request?
Spark ui about the contents of the form need to have hidden and show features, when the table records very much. Because sometimes you do not care about the record of the table, you just want to see the contents of the next table, but you have to scroll the scroll bar for a long time to see the contents of the next table.
Currently we have about 500 workers, but I just wanted to see the logs for the running applications table. I had to scroll through the scroll bars for a long time to see the logs for the running applications table.
In order to ensure functional consistency, I modified the Master Page, Worker Page, Job Page, Stage Page, Task Page, Configuration Page, Storage Page, Pool Page.
fix before:
fix after:
## How was this patch tested?
manual tests
Please review http://spark.apache.org/contributing.html before opening a pull request.
Author: guoxiaolong <gu...@zte.com.cn>
Closes #20216 from guoxiaolongzte/SPARK-23024.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/e1c33b6c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/e1c33b6c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/e1c33b6c
Branch: refs/heads/master
Commit: e1c33b6cd14e4e1123814f4d040e3520db7d1ec9
Parents: e41400c
Author: guoxiaolong <gu...@zte.com.cn>
Authored: Fri Jan 19 08:22:24 2018 -0600
Committer: Sean Owen <so...@cloudera.com>
Committed: Fri Jan 19 08:22:24 2018 -0600
----------------------------------------------------------------------
.../org/apache/spark/ui/static/webui.js | 30 +++++++++
.../deploy/master/ui/ApplicationPage.scala | 25 +++++--
.../spark/deploy/master/ui/MasterPage.scala | 63 +++++++++++++++---
.../spark/deploy/worker/ui/WorkerPage.scala | 52 ++++++++++++---
.../apache/spark/ui/env/EnvironmentPage.scala | 48 ++++++++++++--
.../org/apache/spark/ui/jobs/AllJobsPage.scala | 39 +++++++++--
.../apache/spark/ui/jobs/AllStagesPage.scala | 67 ++++++++++++++++---
.../org/apache/spark/ui/jobs/JobPage.scala | 68 +++++++++++++++++---
.../org/apache/spark/ui/jobs/PoolPage.scala | 13 +++-
.../org/apache/spark/ui/jobs/StagePage.scala | 12 +++-
.../apache/spark/ui/storage/StoragePage.scala | 12 +++-
11 files changed, 373 insertions(+), 56 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/resources/org/apache/spark/ui/static/webui.js
----------------------------------------------------------------------
diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.js b/core/src/main/resources/org/apache/spark/ui/static/webui.js
index 0fa1fcf..e575c4c 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/webui.js
+++ b/core/src/main/resources/org/apache/spark/ui/static/webui.js
@@ -50,4 +50,34 @@ function collapseTable(thisName, table){
// to remember if it's collapsed on each page reload
$(function() {
collapseTablePageLoad('collapse-aggregated-metrics','aggregated-metrics');
+ collapseTablePageLoad('collapse-aggregated-executors','aggregated-executors');
+ collapseTablePageLoad('collapse-aggregated-removedExecutors','aggregated-removedExecutors');
+ collapseTablePageLoad('collapse-aggregated-workers','aggregated-workers');
+ collapseTablePageLoad('collapse-aggregated-activeApps','aggregated-activeApps');
+ collapseTablePageLoad('collapse-aggregated-activeDrivers','aggregated-activeDrivers');
+ collapseTablePageLoad('collapse-aggregated-completedApps','aggregated-completedApps');
+ collapseTablePageLoad('collapse-aggregated-completedDrivers','aggregated-completedDrivers');
+ collapseTablePageLoad('collapse-aggregated-runningExecutors','aggregated-runningExecutors');
+ collapseTablePageLoad('collapse-aggregated-runningDrivers','aggregated-runningDrivers');
+ collapseTablePageLoad('collapse-aggregated-finishedExecutors','aggregated-finishedExecutors');
+ collapseTablePageLoad('collapse-aggregated-finishedDrivers','aggregated-finishedDrivers');
+ collapseTablePageLoad('collapse-aggregated-runtimeInformation','aggregated-runtimeInformation');
+ collapseTablePageLoad('collapse-aggregated-sparkProperties','aggregated-sparkProperties');
+ collapseTablePageLoad('collapse-aggregated-systemProperties','aggregated-systemProperties');
+ collapseTablePageLoad('collapse-aggregated-classpathEntries','aggregated-classpathEntries');
+ collapseTablePageLoad('collapse-aggregated-activeJobs','aggregated-activeJobs');
+ collapseTablePageLoad('collapse-aggregated-completedJobs','aggregated-completedJobs');
+ collapseTablePageLoad('collapse-aggregated-failedJobs','aggregated-failedJobs');
+ collapseTablePageLoad('collapse-aggregated-poolTable','aggregated-poolTable');
+ collapseTablePageLoad('collapse-aggregated-allActiveStages','aggregated-allActiveStages');
+ collapseTablePageLoad('collapse-aggregated-allPendingStages','aggregated-allPendingStages');
+ collapseTablePageLoad('collapse-aggregated-allCompletedStages','aggregated-allCompletedStages');
+ collapseTablePageLoad('collapse-aggregated-allFailedStages','aggregated-allFailedStages');
+ collapseTablePageLoad('collapse-aggregated-activeStages','aggregated-activeStages');
+ collapseTablePageLoad('collapse-aggregated-pendingOrSkippedStages','aggregated-pendingOrSkippedStages');
+ collapseTablePageLoad('collapse-aggregated-completedStages','aggregated-completedStages');
+ collapseTablePageLoad('collapse-aggregated-failedStages','aggregated-failedStages');
+ collapseTablePageLoad('collapse-aggregated-poolActiveStages','aggregated-poolActiveStages');
+ collapseTablePageLoad('collapse-aggregated-tasks','aggregated-tasks');
+ collapseTablePageLoad('collapse-aggregated-rdds','aggregated-rdds');
});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
index 68e57b7..f699c75 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/ApplicationPage.scala
@@ -100,12 +100,29 @@ private[ui] class ApplicationPage(parent: MasterWebUI) extends WebUIPage("app")
<div class="row-fluid"> <!-- Executors -->
<div class="span12">
- <h4> Executor Summary ({allExecutors.length}) </h4>
- {executorsTable}
+ <span class="collapse-aggregated-executors collapse-table"
+ onClick="collapseTable('collapse-aggregated-executors','aggregated-executors')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Executor Summary ({allExecutors.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-executors collapsible-table">
+ {executorsTable}
+ </div>
{
if (removedExecutors.nonEmpty) {
- <h4> Removed Executors ({removedExecutors.length}) </h4> ++
- removedExecutorsTable
+ <span class="collapse-aggregated-removedExecutors collapse-table"
+ onClick="collapseTable('collapse-aggregated-removedExecutors',
+ 'aggregated-removedExecutors')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Removed Executors ({removedExecutors.length})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-removedExecutors collapsible-table">
+ {removedExecutorsTable}
+ </div>
}
}
</div>
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
index bc0bf6a..c629937 100644
--- a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -128,15 +128,31 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
<div class="row-fluid">
<div class="span12">
- <h4> Workers ({workers.length}) </h4>
- {workerTable}
+ <span class="collapse-aggregated-workers collapse-table"
+ onClick="collapseTable('collapse-aggregated-workers','aggregated-workers')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Workers ({workers.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-workers collapsible-table">
+ {workerTable}
+ </div>
</div>
</div>
<div class="row-fluid">
<div class="span12">
- <h4 id="running-app"> Running Applications ({activeApps.length}) </h4>
- {activeAppsTable}
+ <span id="running-app" class="collapse-aggregated-activeApps collapse-table"
+ onClick="collapseTable('collapse-aggregated-activeApps','aggregated-activeApps')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Running Applications ({activeApps.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-activeApps collapsible-table">
+ {activeAppsTable}
+ </div>
</div>
</div>
@@ -144,8 +160,17 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
{if (hasDrivers) {
<div class="row-fluid">
<div class="span12">
- <h4> Running Drivers ({activeDrivers.length}) </h4>
- {activeDriversTable}
+ <span class="collapse-aggregated-activeDrivers collapse-table"
+ onClick="collapseTable('collapse-aggregated-activeDrivers',
+ 'aggregated-activeDrivers')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Running Drivers ({activeDrivers.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-activeDrivers collapsible-table">
+ {activeDriversTable}
+ </div>
</div>
</div>
}
@@ -154,8 +179,17 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
<div class="row-fluid">
<div class="span12">
- <h4 id="completed-app"> Completed Applications ({completedApps.length}) </h4>
- {completedAppsTable}
+ <span id="completed-app" class="collapse-aggregated-completedApps collapse-table"
+ onClick="collapseTable('collapse-aggregated-completedApps',
+ 'aggregated-completedApps')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Completed Applications ({completedApps.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-completedApps collapsible-table">
+ {completedAppsTable}
+ </div>
</div>
</div>
@@ -164,8 +198,17 @@ private[ui] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
if (hasDrivers) {
<div class="row-fluid">
<div class="span12">
- <h4> Completed Drivers ({completedDrivers.length}) </h4>
- {completedDriversTable}
+ <span class="collapse-aggregated-completedDrivers collapse-table"
+ onClick="collapseTable('collapse-aggregated-completedDrivers',
+ 'aggregated-completedDrivers')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Completed Drivers ({completedDrivers.length})</a>
+ </h4>
+ </span>
+ <div class="aggregated-completedDrivers collapsible-table">
+ {completedDriversTable}
+ </div>
</div>
</div>
}
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
index ce84bc4..8b98ae5 100644
--- a/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/worker/ui/WorkerPage.scala
@@ -77,24 +77,60 @@ private[ui] class WorkerPage(parent: WorkerWebUI) extends WebUIPage("") {
</div>
<div class="row-fluid"> <!-- Executors and Drivers -->
<div class="span12">
- <h4> Running Executors ({runningExecutors.size}) </h4>
- {runningExecutorTable}
+ <span class="collapse-aggregated-runningExecutors collapse-table"
+ onClick="collapseTable('collapse-aggregated-runningExecutors',
+ 'aggregated-runningExecutors')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Running Executors ({runningExecutors.size})</a>
+ </h4>
+ </span>
+ <div class="aggregated-runningExecutors collapsible-table">
+ {runningExecutorTable}
+ </div>
{
if (runningDrivers.nonEmpty) {
- <h4> Running Drivers ({runningDrivers.size}) </h4> ++
- runningDriverTable
+ <span class="collapse-aggregated-runningDrivers collapse-table"
+ onClick="collapseTable('collapse-aggregated-runningDrivers',
+ 'aggregated-runningDrivers')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Running Drivers ({runningDrivers.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-runningDrivers collapsible-table">
+ {runningDriverTable}
+ </div>
}
}
{
if (finishedExecutors.nonEmpty) {
- <h4>Finished Executors ({finishedExecutors.size}) </h4> ++
- finishedExecutorTable
+ <span class="collapse-aggregated-finishedExecutors collapse-table"
+ onClick="collapseTable('collapse-aggregated-finishedExecutors',
+ 'aggregated-finishedExecutors')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Finished Executors ({finishedExecutors.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-finishedExecutors collapsible-table">
+ {finishedExecutorTable}
+ </div>
}
}
{
if (finishedDrivers.nonEmpty) {
- <h4> Finished Drivers ({finishedDrivers.size}) </h4> ++
- finishedDriverTable
+ <span class="collapse-aggregated-finishedDrivers collapse-table"
+ onClick="collapseTable('collapse-aggregated-finishedDrivers',
+ 'aggregated-finishedDrivers')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Finished Drivers ({finishedDrivers.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-finishedDrivers collapsible-table">
+ {finishedDriverTable}
+ </div>
}
}
</div>
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala
index 43adab7a..902eb92 100644
--- a/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/env/EnvironmentPage.scala
@@ -48,10 +48,50 @@ private[ui] class EnvironmentPage(
classPathHeaders, classPathRow, appEnv.classpathEntries, fixedWidth = true)
val content =
<span>
- <h4>Runtime Information</h4> {runtimeInformationTable}
- <h4>Spark Properties</h4> {sparkPropertiesTable}
- <h4>System Properties</h4> {systemPropertiesTable}
- <h4>Classpath Entries</h4> {classpathEntriesTable}
+ <span class="collapse-aggregated-runtimeInformation collapse-table"
+ onClick="collapseTable('collapse-aggregated-runtimeInformation',
+ 'aggregated-runtimeInformation')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Runtime Information</a>
+ </h4>
+ </span>
+ <div class="aggregated-runtimeInformation collapsible-table">
+ {runtimeInformationTable}
+ </div>
+ <span class="collapse-aggregated-sparkProperties collapse-table"
+ onClick="collapseTable('collapse-aggregated-sparkProperties',
+ 'aggregated-sparkProperties')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Spark Properties</a>
+ </h4>
+ </span>
+ <div class="aggregated-sparkProperties collapsible-table">
+ {sparkPropertiesTable}
+ </div>
+ <span class="collapse-aggregated-systemProperties collapse-table"
+ onClick="collapseTable('collapse-aggregated-systemProperties',
+ 'aggregated-systemProperties')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>System Properties</a>
+ </h4>
+ </span>
+ <div class="aggregated-systemProperties collapsible-table">
+ {systemPropertiesTable}
+ </div>
+ <span class="collapse-aggregated-classpathEntries collapse-table"
+ onClick="collapseTable('collapse-aggregated-classpathEntries',
+ 'aggregated-classpathEntries')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Classpath Entries</a>
+ </h4>
+ </span>
+ <div class="aggregated-classpathEntries collapsible-table">
+ {classpathEntriesTable}
+ </div>
</span>
UIUtils.headerSparkPage("Environment", content, parent)
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
index ff916bb..e3b72f1 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
@@ -363,16 +363,43 @@ private[ui] class AllJobsPage(parent: JobsTab, store: AppStatusStore) extends We
store.executorList(false), startTime)
if (shouldShowActiveJobs) {
- content ++= <h4 id="active">Active Jobs ({activeJobs.size})</h4> ++
- activeJobsTable
+ content ++=
+ <span id="active" class="collapse-aggregated-activeJobs collapse-table"
+ onClick="collapseTable('collapse-aggregated-activeJobs','aggregated-activeJobs')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Active Jobs ({activeJobs.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-activeJobs collapsible-table">
+ {activeJobsTable}
+ </div>
}
if (shouldShowCompletedJobs) {
- content ++= <h4 id="completed">Completed Jobs ({completedJobNumStr})</h4> ++
- completedJobsTable
+ content ++=
+ <span id="completed" class="collapse-aggregated-completedJobs collapse-table"
+ onClick="collapseTable('collapse-aggregated-completedJobs','aggregated-completedJobs')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Completed Jobs ({completedJobNumStr})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-completedJobs collapsible-table">
+ {completedJobsTable}
+ </div>
}
if (shouldShowFailedJobs) {
- content ++= <h4 id ="failed">Failed Jobs ({failedJobs.size})</h4> ++
- failedJobsTable
+ content ++=
+ <span id ="failed" class="collapse-aggregated-failedJobs collapse-table"
+ onClick="collapseTable('collapse-aggregated-failedJobs','aggregated-failedJobs')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Failed Jobs ({failedJobs.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-failedJobs collapsible-table">
+ {failedJobsTable}
+ </div>
}
val helpText = """A job is triggered by an action, like count() or saveAsTextFile().""" +
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala
index b1e3434..606dc1e 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllStagesPage.scala
@@ -116,26 +116,75 @@ private[ui] class AllStagesPage(parent: StagesTab) extends WebUIPage("") {
var content = summary ++
{
if (sc.isDefined && isFairScheduler) {
- <h4>Fair Scheduler Pools ({pools.size})</h4> ++ poolTable.toNodeSeq
+ <span class="collapse-aggregated-poolTable collapse-table"
+ onClick="collapseTable('collapse-aggregated-poolTable','aggregated-poolTable')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Fair Scheduler Pools ({pools.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-poolTable collapsible-table">
+ {poolTable.toNodeSeq}
+ </div>
} else {
Seq.empty[Node]
}
}
if (shouldShowActiveStages) {
- content ++= <h4 id="active">Active Stages ({activeStages.size})</h4> ++
- activeStagesTable.toNodeSeq
+ content ++=
+ <span id="active" class="collapse-aggregated-allActiveStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-allActiveStages',
+ 'aggregated-allActiveStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Active Stages ({activeStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-allActiveStages collapsible-table">
+ {activeStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowPendingStages) {
- content ++= <h4 id="pending">Pending Stages ({pendingStages.size})</h4> ++
- pendingStagesTable.toNodeSeq
+ content ++=
+ <span id="pending" class="collapse-aggregated-allPendingStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-allPendingStages',
+ 'aggregated-allPendingStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Pending Stages ({pendingStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-allPendingStages collapsible-table">
+ {pendingStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowCompletedStages) {
- content ++= <h4 id="completed">Completed Stages ({completedStageNumStr})</h4> ++
- completedStagesTable.toNodeSeq
+ content ++=
+ <span id="completed" class="collapse-aggregated-allCompletedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-allCompletedStages',
+ 'aggregated-allCompletedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Completed Stages ({completedStageNumStr})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-allCompletedStages collapsible-table">
+ {completedStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowFailedStages) {
- content ++= <h4 id ="failed">Failed Stages ({numFailedStages})</h4> ++
- failedStagesTable.toNodeSeq
+ content ++=
+ <span id ="failed" class="collapse-aggregated-allFailedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-allFailedStages',
+ 'aggregated-allFailedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Failed Stages ({numFailedStages})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-allFailedStages collapsible-table">
+ {failedStagesTable.toNodeSeq}
+ </div>
}
UIUtils.headerSparkPage("Stages for All Jobs", content, parent)
}
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
index bf59152..c27f30c 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/JobPage.scala
@@ -340,24 +340,72 @@ private[ui] class JobPage(parent: JobsTab, store: AppStatusStore) extends WebUIP
jobId, store.operationGraphForJob(jobId))
if (shouldShowActiveStages) {
- content ++= <h4 id="active">Active Stages ({activeStages.size})</h4> ++
- activeStagesTable.toNodeSeq
+ content ++=
+ <span id="active" class="collapse-aggregated-activeStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-activeStages','aggregated-activeStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Active Stages ({activeStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-activeStages collapsible-table">
+ {activeStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowPendingStages) {
- content ++= <h4 id="pending">Pending Stages ({pendingOrSkippedStages.size})</h4> ++
- pendingOrSkippedStagesTable.toNodeSeq
+ content ++=
+ <span id="pending" class="collapse-aggregated-pendingOrSkippedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-pendingOrSkippedStages',
+ 'aggregated-pendingOrSkippedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Pending Stages ({pendingOrSkippedStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-pendingOrSkippedStages collapsible-table">
+ {pendingOrSkippedStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowCompletedStages) {
- content ++= <h4 id="completed">Completed Stages ({completedStages.size})</h4> ++
- completedStagesTable.toNodeSeq
+ content ++=
+ <span id="completed" class="collapse-aggregated-completedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-completedStages',
+ 'aggregated-completedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Completed Stages ({completedStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-completedStages collapsible-table">
+ {completedStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowSkippedStages) {
- content ++= <h4 id="skipped">Skipped Stages ({pendingOrSkippedStages.size})</h4> ++
- pendingOrSkippedStagesTable.toNodeSeq
+ content ++=
+ <span id="skipped" class="collapse-aggregated-pendingOrSkippedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-pendingOrSkippedStages',
+ 'aggregated-pendingOrSkippedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Skipped Stages ({pendingOrSkippedStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-pendingOrSkippedStages collapsible-table">
+ {pendingOrSkippedStagesTable.toNodeSeq}
+ </div>
}
if (shouldShowFailedStages) {
- content ++= <h4 id ="failed">Failed Stages ({failedStages.size})</h4> ++
- failedStagesTable.toNodeSeq
+ content ++=
+ <span id ="failed" class="collapse-aggregated-failedStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-failedStages','aggregated-failedStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Failed Stages ({failedStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-failedStages collapsible-table">
+ {failedStagesTable.toNodeSeq}
+ </div>
}
UIUtils.headerSparkPage(s"Details for Job $jobId", content, parent, showVisualization = true)
}
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala
index 98fbd7a..a3e1f13 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/PoolPage.scala
@@ -51,7 +51,18 @@ private[ui] class PoolPage(parent: StagesTab) extends WebUIPage("pool") {
val poolTable = new PoolTable(Map(pool -> uiPool), parent)
var content = <h4>Summary </h4> ++ poolTable.toNodeSeq
if (activeStages.nonEmpty) {
- content ++= <h4>Active Stages ({activeStages.size})</h4> ++ activeStagesTable.toNodeSeq
+ content ++=
+ <span class="collapse-aggregated-poolActiveStages collapse-table"
+ onClick="collapseTable('collapse-aggregated-poolActiveStages',
+ 'aggregated-poolActiveStages')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Active Stages ({activeStages.size})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-poolActiveStages collapsible-table">
+ {activeStagesTable.toNodeSeq}
+ </div>
}
UIUtils.headerSparkPage("Fair Scheduler Pool: " + poolName, content, parent)
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index af78373..25bee33 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -486,8 +486,16 @@ private[ui] class StagePage(parent: StagesTab, store: AppStatusStore) extends We
<div>{summaryTable.getOrElse("No tasks have reported metrics yet.")}</div> ++
aggMetrics ++
maybeAccumulableTable ++
- <h4 id="tasks-section">Tasks ({totalTasksNumStr})</h4> ++
- taskTableHTML ++ jsForScrollingDownToTaskTable
+ <span id="tasks-section" class="collapse-aggregated-tasks collapse-table"
+ onClick="collapseTable('collapse-aggregated-tasks','aggregated-tasks')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>Tasks ({totalTasksNumStr})</a>
+ </h4>
+ </span> ++
+ <div class="aggregated-tasks collapsible-table">
+ {taskTableHTML ++ jsForScrollingDownToTaskTable}
+ </div>
UIUtils.headerSparkPage(stageHeader, content, parent, showVisualization = true)
}
http://git-wip-us.apache.org/repos/asf/spark/blob/e1c33b6c/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala
index b8aec98..68d9465 100644
--- a/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/storage/StoragePage.scala
@@ -41,8 +41,16 @@ private[ui] class StoragePage(parent: SparkUITab, store: AppStatusStore) extends
Nil
} else {
<div>
- <h4>RDDs</h4>
- {UIUtils.listingTable(rddHeader, rddRow, rdds, id = Some("storage-by-rdd-table"))}
+ <span class="collapse-aggregated-rdds collapse-table"
+ onClick="collapseTable('collapse-aggregated-rdds','aggregated-rdds')">
+ <h4>
+ <span class="collapse-table-arrow arrow-open"></span>
+ <a>RDDs</a>
+ </h4>
+ </span>
+ <div class="aggregated-rdds collapsible-table">
+ {UIUtils.listingTable(rddHeader, rddRow, rdds, id = Some("storage-by-rdd-table"))}
+ </div>
</div>
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org