Skip to content

[SPARK-55863][UI] Move Application-level information from Job Tab to footer #54657

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
yaooqinn wants to merge 1 commit into from
+51 −24
Closed

[SPARK-55863][UI] Move Application-level information from Job Tab to footer #54657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions core/src/main/resources/org/apache/spark/ui/static/webui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,3 +107,16 @@ $(function() {
clickPhysicalPlanDetails();
});
});

// Footer uptime counter
$(function() {
var el = document.getElementById("footer-uptime");
if (!el) return;
function update() {
var ms = Date.now() - Number(el.dataset.startTime);
var m = Math.floor(ms / 60000), h = Math.floor(m / 60), d = Math.floor(h / 24);
el.textContent = "Uptime: " + (d > 0 ? d + "d " : "") + (h % 24) + "h " + (m % 60) + "m";
}
update();
setInterval(update, 60000);
});
10 changes: 10 additions & 0 deletions core/src/main/scala/org/apache/spark/ui/SparkUI.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,16 @@ private[spark] abstract class SparkUITab(parent: SparkUI, prefix: String)
def appName: String = parent.appName

def appSparkVersion: String = parent.appSparkVersion

def sparkUser: String = parent.getSparkUser

def appStartTime: Long = {
try {
parent.store.applicationInfo().attempts.head.startTime.getTime
} catch {
case _: Exception => System.currentTimeMillis()
}
}
}

private[spark] object SparkUI {
Expand Down
33 changes: 28 additions & 5 deletions core/src/main/scala/org/apache/spark/ui/UIUtils.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import jakarta.ws.rs.core.{MediaType, MultivaluedMap, Response}
import org.eclipse.jetty.server.Request
import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap

import org.apache.spark.SparkContext
import org.apache.spark.internal.Logging
import org.apache.spark.ui.scope.RDDOperationGraph

Expand Down Expand Up @@ -290,14 +291,13 @@ private[spark] object UIUtils extends Logging {
href={prependBaseUri(request, "/static/spark-logo.svg")}></link>
<title>{appName} - {title}</title>
</head>
<body>
<body class="d-flex flex-column min-vh-100">
<nav class="navbar navbar-expand-md navbar-light bg-light mb-4">
<div class="navbar-header">
<div class="navbar-brand">
<a href={prependBaseUri(request, "/")}>
<img src={prependBaseUri(request, "/static/spark-logo.svg")}
alt="Spark Logo" height="36" />
<span class="version">{activeTab.appSparkVersion}</span>
</a>
</div>
</div>
Expand All @@ -314,7 +314,7 @@ private[spark] object UIUtils extends Logging {
</span>
</div>
</nav>
<div class="container-fluid">
<div class="container-fluid flex-fill">
<div class="row">
<div class="col-12">
<h3 class="align-bottom text-nowrap overflow-hidden text-truncate">
Expand All @@ -329,6 +329,7 @@ private[spark] object UIUtils extends Logging {
</div>
</div>
</div>
{sparkFooter(Some(activeTab))}
</body>
</html>
}
Expand All @@ -347,8 +348,8 @@ private[spark] object UIUtils extends Logging {
href={prependBaseUri(request, "/static/spark-logo.svg")}></link>
<title>{title}</title>
</head>
<body>
<div class="container-fluid">
<body class="d-flex flex-column min-vh-100">
<div class="container-fluid flex-fill">
<div class="row">
<div class="col-12">
<h3 class="align-middle d-inline-block">
Expand All @@ -367,10 +368,32 @@ private[spark] object UIUtils extends Logging {
</div>
</div>
</div>
{sparkFooter()}
</body>
</html>
}

private def sparkFooter(tab: Option[SparkUITab] = None): Seq[Node] = {
val user = tab.map(_.sparkUser).getOrElse(System.getProperty("user.name", ""))
val version = tab.map(_.appSparkVersion).getOrElse(org.apache.spark.SPARK_VERSION)
val startTimeOpt = tab.map(_.appStartTime).orElse(SparkContext.getActive.map(_.startTime))

// scalastyle:off
<footer class="footer mt-auto py-2 bg-body-tertiary border-top">
<div class="container-fluid">
<div class="d-flex justify-content-between align-items-center small text-body-secondary">
<span>{version}</span>
{startTimeOpt.map { t =>
<span>Started: {formatDate(new Date(t))}</span>
<span id="footer-uptime" data-start-time={t.toString}></span>
}.getOrElse(Seq.empty)}
<span>{user}</span>
</div>
</div>
</footer>
// scalastyle:on
}

/** Returns an HTML table constructed by generating a row for each object in a sequence. */
def listingTable[T](
headers: Seq[String],
Expand Down
19 changes: 0 additions & 19 deletions core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,25 +321,6 @@ private[ui] class AllJobsPage(parent: JobsTab, store: AppStatusStore) extends We
val summary: NodeSeq =
<div>
<ul class="list-unstyled">
<li>

<strong>User:</strong>
{parent.getSparkUser}
</li>
<li>
<strong>Started At:</strong>
{UIUtils.formatDate(startDate)}
</li>
<li>
<strong>Total Uptime:</strong>
{
if (endTime < 0 && parent.sc.isDefined) {
UIUtils.formatDuration(System.currentTimeMillis() - startTime)
} else if (endTime > 0) {
UIUtils.formatDuration(endTime - startTime)
}
}
</li>
<li>
<strong>Scheduling Mode: </strong>
{schedulingMode}
Expand Down