Skip to content

[SPARK-16673] [Web UI] New Executor Page removed conditional for Logs and Thread Dump columns #14382

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
wants to merge 1 commit into from
Closed

[SPARK-16673] [Web UI] New Executor Page removed conditional for Logs and Thread Dump columns #14382

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
38 changes: 31 additions & 7 deletions core/src/main/resources/org/apache/spark/ui/static/executorspage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@
* limitations under the License.
*/

var threadDumpEnabled = false;

function setThreadDumpEnabled(val) {
threadDumpEnabled = val;
}

function getThreadDumpEnabled() {
return threadDumpEnabled;
}

function formatStatus(status, type) {
if (type !== 'display') return status;
if (status) {
Expand Down Expand Up @@ -116,6 +126,12 @@ function formatLogsCells(execLogs, type) {
return result;
}

function logsExist(execs) {
return execs.some(function(exec) {
return !($.isEmptyObject(exec["executorLogs"]));
});
}

// Determine Color Opacity from 0.5-1
// activeTasks range from 0 to maxTasks
function activeTasksAlpha(activeTasks, maxTasks) {
Expand Down Expand Up @@ -143,18 +159,16 @@ function totalDurationAlpha(totalGCTime, totalDuration) {
(Math.min(totalGCTime / totalDuration + 0.5, 1)) : 1;
}

// When GCTimePercent is edited change ToolTips.TASK_TIME to match
var GCTimePercent = 0.1;

function totalDurationStyle(totalGCTime, totalDuration) {
// Red if GC time over GCTimePercent of total time
// When GCTimePercent is edited change ToolTips.TASK_TIME to match
var GCTimePercent = 0.1;
return (totalGCTime > GCTimePercent * totalDuration) ?
("hsla(0, 100%, 50%, " + totalDurationAlpha(totalGCTime, totalDuration) + ")") : "";
}

function totalDurationColor(totalGCTime, totalDuration) {
// Red if GC time over GCTimePercent of total time
// When GCTimePercent is edited change ToolTips.TASK_TIME to match
var GCTimePercent = 0.1;
return (totalGCTime > GCTimePercent * totalDuration) ? "white" : "black";
}

Expand Down Expand Up @@ -392,8 +406,18 @@ $(document).ready(function () {
{data: 'executorLogs', render: formatLogsCells},
{
data: 'id', render: function (data, type) {
return type === 'display' ? ("<a href='threadDump/?executorId=" + data + "'>Thread Dump</a>" ) : data;
return type === 'display' ? ("<a href='threadDump/?executorId=" + data + "'>Thread Dump</a>" ) : data;
}
}
],
"columnDefs": [
{
"targets": [ 15 ],
"visible": logsExist(response)
},
{
"targets": [ 16 ],
"visible": getThreadDumpEnabled()
}
],
"order": [[0, "asc"]]
Expand Down Expand Up @@ -458,7 +482,7 @@ $(document).ready(function () {
"paging": false,
"searching": false,
"info": false

};

$(sumSelector).DataTable(sumConf);
Expand Down
7 changes: 3 additions & 4 deletions core/src/main/scala/org/apache/spark/ui/exec/ExecutorsPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,15 @@ private[ui] class ExecutorsPage(
threadDumpEnabled: Boolean)
extends WebUIPage("") {
private val listener = parent.listener
// When GCTimePercent is edited change ToolTips.TASK_TIME to match
private val GCTimePercent = 0.1

def render(request: HttpServletRequest): Seq[Node] = {
val content =
<div>
{
<div id="active-executors"></div> ++
<div id="active-executors"></div> ++
<script src={UIUtils.prependBaseUri("/static/utils.js")}></script> ++
<script src={UIUtils.prependBaseUri("/static/executorspage.js")}></script>
<script src={UIUtils.prependBaseUri("/static/executorspage.js")}></script> ++
<script>setThreadDumpEnabled({threadDumpEnabled})</script>
}
</div>;

Expand Down