Github user abellina commented on a diff in the pull request: https://github.com/apache/spark/pull/21688#discussion_r221671401 --- Diff: core/src/main/resources/org/apache/spark/ui/static/stagepage.js --- @@ -0,0 +1,906 @@ +/* + * 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. + */ + +var blockUICount = 0; + +$(document).ajaxStop(function () { + if (blockUICount == 0) { + $.unblockUI(); + blockUICount++; + } +}); + +$(document).ajaxStart(function () { + if (blockUICount == 0) { + $.blockUI({message: '<h3>Loading Stage Page...</h3>'}); + } +}); + +$.extend( $.fn.dataTable.ext.type.order, { + "duration-pre": ConvertDurationString, + + "duration-asc": function ( a, b ) { + a = ConvertDurationString( a ); + b = ConvertDurationString( b ); + return ((a < b) ? -1 : ((a > b) ? 1 : 0)); + }, + + "duration-desc": function ( a, b ) { + a = ConvertDurationString( a ); + b = ConvertDurationString( b ); + return ((a < b) ? 1 : ((a > b) ? -1 : 0)); + } +} ); + +// This function will only parse the URL under certain format +// e.g. (history) https://domain:50509/history/application_1536254569791_3806251/1/stages/stage/?id=4&attempt=1 +// e.g. (proxy) https://domain:50505/proxy/application_1502220952225_59143/stages/stage?id=4&attempt=1 +function stageEndPoint(appId) { + var urlRegex = /https\:\/\/[^\/]+\/([^\/]+)\/([^\/]+)\/([^\/]+)?\/?([^\/]+)?\/?([^\/]+)?\/?([^\/]+)?/gm; + var urlArray = urlRegex.exec(document.baseURI); + var ind = urlArray.indexOf("proxy"); + var queryString = document.baseURI.split('?'); + var words = document.baseURI.split('/'); + if (ind > 0) { + var appId = urlArray[2]; + var stageId = queryString[1].split("&").filter(word => word.includes("id="))[0].split("=")[1]; + var indexOfProxy = words.indexOf("proxy"); + var newBaseURI = words.slice(0, indexOfProxy + 2).join('/'); + return newBaseURI + "/api/v1/applications/" + appId + "/stages/" + stageId; + } + ind = urlArray.indexOf("history"); + if (ind > 0) { + var appId = urlArray[2]; + var appAttemptId = urlArray[ind + 2]; + var stageId = queryString[1].split("&").filter(word => word.includes("id="))[0].split("=")[1]; + var indexOfHistory = words.indexOf("history"); + var newBaseURI = words.slice(0, indexOfHistory).join('/'); + if (isNaN(appAttemptId) || appAttemptId == "0") { + return newBaseURI + "/api/v1/applications/" + appId + "/stages/" + stageId; + } else { + return newBaseURI + "/api/v1/applications/" + appId + "/" + appAttemptId + "/stages/" + stageId; + } + } + var stageId = queryString[1].split("&").filter(word => word.includes("id="))[0].split("=")[1]; + return location.origin + "/api/v1/applications/" + appId + "/stages/" + stageId; +} + +function getColumnNameForTaskMetricSummary(columnKey) { + switch(columnKey) { + case "executorRunTime": + return "Duration"; + break; + + case "jvmGcTime": + return "GC Time"; + break; + + case "gettingResultTime": + return "Getting Result Time"; + break; + + case "inputMetrics": + return "Input Size / Records"; + break; + + case "outputMetrics": + return "Output Size / Records"; + break; + + case "peakExecutionMemory": + return "Peak Execution Memory"; + break; + + case "resultSerializationTime": + return "Result Serialization Time"; + break; + + case "schedulerDelay": + return "Scheduler Delay"; + break; + + case "diskBytesSpilled": + return "Shuffle spill (disk)"; + break; + + case "memoryBytesSpilled": + return "Shuffle spill (memory)"; + break; + + case "shuffleReadMetrics": + return "Shuffle Read Size / Records"; + break; + + case "shuffleWriteMetrics": + return "Shuffle Write Size / Records"; + break; + + case "executorDeserializeTime": + return "Task Deserialization Time"; + break; + + default: + return "NA"; + } +} + +function displayRowsForSummaryMetricsTable(row, type, columnIndex) { + switch(row.metric) { + case 'Input Size / Records': + var str = formatBytes(row.data.bytesRead[columnIndex], type) + " / " + + row.data.recordsRead[columnIndex]; + return str; + break; + + case 'Output Size / Records': + var str = formatBytes(row.data.bytesWritten[columnIndex], type) + " / " + + row.data.recordsWritten[columnIndex]; + return str; + break; + + case 'Shuffle Read Size / Records': + var str = formatBytes(row.data.readBytes[columnIndex], type) + " / " + + row.data.readRecords[columnIndex]; + return str; + break; + + case 'Shuffle Read Blocked Time': + var str = formatDuration(row.data.fetchWaitTime[columnIndex]); + return str; + break; + + case 'Shuffle Remote Reads': + var str = formatBytes(row.data.remoteBytesRead[columnIndex], type); + return str; + break; + + case 'Shuffle Write Size / Records': + var str = formatBytes(row.data.writeBytes[columnIndex], type) + " / " + + row.data.writeRecords[columnIndex]; + return str; + break; + + default: + return (row.metric == 'Peak Execution Memory' || row.metric == 'Shuffle spill (memory)' + || row.metric == 'Shuffle spill (disk)') ? formatBytes(row.data[columnIndex], type) : (formatDuration(row.data[columnIndex])); + + } +} + +function createDataTableForTaskSummaryMetricsTable(task_summary_metrics_table) { + var taskMetricsTable = "#summary-metrics-table"; + if ($.fn.dataTable.isDataTable(taskMetricsTable)) { + taskSummaryMetricsDataTable.clear().draw(); + taskSummaryMetricsDataTable.rows.add(task_summary_metrics_table).draw(); + } else { + var task_conf = { + "data": task_summary_metrics_table, + "columns": [ + {data : 'metric'}, + // Min + { + data: function (row, type) { + return displayRowsForSummaryMetricsTable(row, type, 0); + } + }, + // 25th percentile + { + data: function (row, type) { + return displayRowsForSummaryMetricsTable(row, type, 1); + } + }, + // Median + { + data: function (row, type) { + return displayRowsForSummaryMetricsTable(row, type, 2); + } + }, + // 75th percentile + { + data: function (row, type) { + return displayRowsForSummaryMetricsTable(row, type, 3); + } + }, + // Max + { + data: function (row, type) { + return displayRowsForSummaryMetricsTable(row, type, 4); + } + } + ], + "columnDefs": [ + { "type": "duration", "targets": 1 }, + { "type": "duration", "targets": 2 }, + { "type": "duration", "targets": 3 }, + { "type": "duration", "targets": 4 }, + { "type": "duration", "targets": 5 } + ], + "paging": false, + "searching": false, + "order": [[0, "asc"]] + }; + taskSummaryMetricsDataTable = $(taskMetricsTable).DataTable(task_conf); + } + task_summary_metrics_table_current_state_array = task_summary_metrics_table.slice(); +} + +var task_summary_metrics_table_array = []; +var task_summary_metrics_table_current_state_array = []; +var taskSummaryMetricsDataTable; + +$(document).ready(function () { + setDataTableDefaults(); + + $("#showAdditionalMetrics").append( + "<div><a id='additionalMetrics'>" + + "<span class='expand-input-rate-arrow arrow-closed' id='arrowtoggle1'></span>" + + " Show Additional Metrics" + --- End diff -- The show additional metrics checkbox selections are note getting saved, the prior version of the UI would keep the choices.
--- --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org