forked from apache/spark
-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-44153][CORE][UI] Support
Heap Histogram column in `Executors…
…` tab ### What changes were proposed in this pull request? This PR aims to support `Heap Histogram` column in `Executor` tab. ### Why are the changes needed? Like `Thread Dump` column, this is very helpful when we analyze executor live JVM status.   ### Does this PR introduce _any_ user-facing change? Yes, but this is a new column and we provide `spark.ui.heapHistogramEnabled` configuration like `spark.ui.threadDumpsEnabled`. ### How was this patch tested? Manual review. Closes apache#41709 from dongjoon-hyun/SPARK-44153. Authored-by: Dongjoon Hyun <[email protected]> Signed-off-by: Dongjoon Hyun <[email protected]>
- Loading branch information
1 parent
8eda2d8
commit cd69d4d
Showing
9 changed files
with
173 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
89 changes: 89 additions & 0 deletions
89
core/src/main/scala/org/apache/spark/ui/exec/ExecutorHeapHistogramPage.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,89 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.spark.ui.exec | ||
|
|
||
| import javax.servlet.http.HttpServletRequest | ||
|
|
||
| import scala.xml.{Node, Text} | ||
|
|
||
| import org.apache.spark.SparkContext | ||
| import org.apache.spark.ui.{SparkUITab, UIUtils, WebUIPage} | ||
|
|
||
| private[ui] class ExecutorHeapHistogramPage( | ||
| parent: SparkUITab, | ||
| sc: Option[SparkContext]) extends WebUIPage("heapHistogram") { | ||
|
|
||
| // Match the lines containing object informations | ||
| val pattern = """\s*([0-9]+):\s+([0-9]+)\s+([0-9]+)\s+(\S+)(.*)""".r | ||
|
|
||
| def render(request: HttpServletRequest): Seq[Node] = { | ||
| val executorId = Option(request.getParameter("executorId")).map { executorId => | ||
| UIUtils.decodeURLParameter(executorId) | ||
| }.getOrElse { | ||
| throw new IllegalArgumentException(s"Missing executorId parameter") | ||
| } | ||
| val time = System.currentTimeMillis() | ||
| val maybeHeapHistogram = sc.get.getExecutorHeapHistogram(executorId) | ||
|
|
||
| val content = maybeHeapHistogram.map { heapHistogram => | ||
| val rows = heapHistogram.map { row => | ||
| row match { | ||
| case pattern(rank, instances, bytes, name, module) => | ||
| <tr class="accordion-heading"> | ||
| <td>{rank}</td> | ||
| <td>{instances}</td> | ||
| <td>{bytes}</td> | ||
| <td>{name}</td> | ||
| <td>{module}</td> | ||
| </tr> | ||
| case pattern(rank, instances, bytes, name) => | ||
| <tr class="accordion-heading"> | ||
| <td>{rank}</td> | ||
| <td>{instances}</td> | ||
| <td>{bytes}</td> | ||
| <td>{name}</td> | ||
| <td></td> | ||
| </tr> | ||
| case _ => | ||
| // Ignore the first two lines and the last line | ||
| // | ||
| // num #instances #bytes class name (module) | ||
| // ------------------------------------------------------- | ||
| // ... | ||
| // Total 1267867 72845688 | ||
| } | ||
| } | ||
| <div class="row"> | ||
| <div class="col-12"> | ||
| <p>Updated at {UIUtils.formatDate(time)}</p> | ||
| <table class={UIUtils.TABLE_CLASS_STRIPED + " accordion-group" + " sortable"}> | ||
| <thead> | ||
| <th>Rank</th> | ||
| <th>Instances</th> | ||
| <th>Bytes</th> | ||
| <th>Class Name</th> | ||
| <th>Module</th> | ||
| </thead> | ||
| <tbody>{rows}</tbody> | ||
| </table> | ||
| </div> | ||
| </div> | ||
| }.getOrElse(Text("Error fetching heap histogram")) | ||
| UIUtils.headerSparkPage(request, s"Heap Histogram for Executor $executorId", content, parent) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters