Skip to content

[AURON #2011] History Server fails when BuildInfo event is missing. #2012

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

Open
slfan1989 wants to merge 1 commit into
base: master
Choose a base branch
from
+43 −47
Open

[AURON #2011] History Server fails when BuildInfo event is missing. #2012

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
74 changes: 32 additions & 42 deletions auron-spark-ui/src/main/scala/org/apache/spark/sql/execution/ui/AuronAllExecutionsPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,52 +29,12 @@ private[ui] class AuronAllExecutionsPage(parent: AuronSQLTab) extends WebUIPage(

@sparkver("3.0 / 3.1 / 3.2 / 3.3 / 3.4 / 3.5")
override def render(request: javax.servlet.http.HttpServletRequest): Seq[Node] = {
val buildInfo = sqlStore.buildInfo()
val infos =
UIUtils.listingTable(propertyHeader, propertyRow, buildInfo.info, fixedWidth = true)
val summary: NodeSeq =
<div>
<div>
<span class="collapse-sql-properties collapse-table"
onClick="collapseTable('collapse-sql-properties', 'sql-properties')">
<h4>
<span class="collapse-table-arrow arrow-open"></span>
<a>Auron Build Information</a>
</h4>
</span>
<div class="sql-properties collapsible-table">
{infos}
</div>
</div>
<br/>
</div>

UIUtils.headerSparkPage(request, "Auron", summary, parent)
UIUtils.headerSparkPage(request, "Auron", buildInfoSummary(sqlStore.buildInfo()), parent)
}

@sparkver("4.0 / 4.1")
override def render(request: jakarta.servlet.http.HttpServletRequest): Seq[Node] = {
val buildInfo = sqlStore.buildInfo()
val infos =
UIUtils.listingTable(propertyHeader, propertyRow, buildInfo.info, fixedWidth = true)
val summary: NodeSeq =
<div>
<div>
<span class="collapse-sql-properties collapse-table"
onClick="collapseTable('collapse-sql-properties', 'sql-properties')">
<h4>
<span class="collapse-table-arrow arrow-open"></span>
<a>Auron Build Information</a>
</h4>
</span>
<div class="sql-properties collapsible-table">
{infos}
</div>
</div>
<br/>
</div>

UIUtils.headerSparkPage(request, "Auron", summary, parent)
UIUtils.headerSparkPage(request, "Auron", buildInfoSummary(sqlStore.buildInfo()), parent)
}

private def propertyHeader = Seq("Name", "Value")
Expand All @@ -87,4 +47,34 @@ private[ui] class AuronAllExecutionsPage(parent: AuronSQLTab) extends WebUIPage(
</td>
</tr>

private def buildInfoSummary(buildInfoOpt: Option[AuronBuildInfoUIData]): NodeSeq = {
buildInfoOpt match {
case Some(buildInfo) =>
val infos =
UIUtils.listingTable(propertyHeader, propertyRow, buildInfo.info, fixedWidth = true)
<div>
<div>
<span class="collapse-sql-properties collapse-table"
onClick="collapseTable('collapse-sql-properties', 'sql-properties')">
<h4>
<span class="collapse-table-arrow arrow-open"></span>
<a>Auron Build Information</a>
</h4>
</span>
<div class="sql-properties collapsible-table">
{infos}
</div>
</div>
<br/>
</div>
case None =>
// Show a friendly empty state instead of failing or rendering a blank page.
<div>
<div class="alert alert-warning">
Auron build information is not available for this application.
</div>
</div>
}
}

}
12 changes: 10 additions & 2 deletions auron-spark-ui/src/main/scala/org/apache/spark/sql/execution/ui/AuronSQLAppStatusStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,22 @@
*/
package org.apache.spark.sql.execution.ui

import scala.util.control.NonFatal

import com.fasterxml.jackson.annotation.JsonIgnore
import org.apache.spark.util.kvstore.{KVIndex, KVStore}

class AuronSQLAppStatusStore(store: KVStore) {

def buildInfo(): AuronBuildInfoUIData = {
def buildInfo(): Option[AuronBuildInfoUIData] = {
val kClass = classOf[AuronBuildInfoUIData]
store.read(kClass, kClass.getName)
// KVStore throws when the record doesn't exist; treat missing data as "no build info".
try {
Option(store.read(kClass, kClass.getName))
} catch {
case _: NoSuchElementException => None
case NonFatal(_) => None
}
}
}

Expand Down
4 changes: 1 addition & 3 deletions ...ark-ui/src/main/scala/org/apache/spark/sql/execution/ui/AuronSQLHistoryServerPlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@ class AuronSQLHistoryServerPlugin extends AppHistoryServerPlugin {

override def setupUI(ui: SparkUI): Unit = {
val sqlStatusStore = new AuronSQLAppStatusStore(ui.store.store)
if (sqlStatusStore.buildInfo() != null) {
new AuronSQLTab(sqlStatusStore, ui)
}
new AuronSQLTab(sqlStatusStore, ui)
}

override def displayOrder: Int = 0
Expand Down
Loading