Skip to content

[SPARK-21809] : Change Stage Page to use datatables to support sorting columns and searching #19270

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 10 commits into from
Closed

[SPARK-21809] : Change Stage Page to use datatables to support sorting columns and searching #19270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01c9244
[SPARK-21809] : Change Stage Page to use datatables to support sortin…
Sep 12, 2017
4b94bc0
[SPARK-21809] : Fixing code to pass ScalaStyle Tests
Sep 12, 2017
c588953
[SPARK-21809] : Adding new fields at the end of constructor definition
Sep 13, 2017
dd12be7
[SPARK-21809]: Adding Problem Filter to MiMa Excludes
Sep 20, 2017
098a93d
[SPARK-21809] : Change Stage Page to use datatables to support sortin…
Sep 27, 2017
c1f85ae
[SPARK-21809] : Fixing issue of not being able to see changes in web …
Sep 29, 2017
25b5215
[SPARK-21809]: Made changes as per comments
Oct 6, 2017
0b2a8cf
[SPARK-21809] : Fixed accumulators table issue
Oct 9, 2017
f649e42
[SPARK-21809] : Made changes as per comments
Oct 11, 2017
ef90c2a
[SPARK-21809] : Made changes as per comments
Oct 12, 2017
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
4 changes: 2 additions & 2 deletions core/src/main/resources/org/apache/spark/ui/static/executorspage-template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->

<script id="executors-summary-template" type="text/html">
<h4 style="clear: left; display: inline-block;">Summary</h4>
<h4 class="title-table">Summary</h4>
<div class="container-fluid">
<div class="container-fluid">
<table id="summary-execs-table" class="table table-striped compact">
Expand Down Expand Up @@ -64,7 +64,7 @@ <h4 style="clear: left; display: inline-block;">Summary</h4>
</table>
</div>
</div>
<h4 style="clear: left; display: inline-block;">Executors</h4>
<h4 class="title-table">Executors</h4>
<div class="container-fluid">
<div class="container-fluid">
<table id="active-executors-table" class="table table-striped compact">
Expand Down
60 changes: 3 additions & 57 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 @@ -53,46 +53,6 @@ $(document).ajaxStart(function () {
$.blockUI({message: '<h3>Loading Executors Page...</h3>'});
});

function createTemplateURI(appId) {
var words = document.baseURI.split('/');
var ind = words.indexOf("proxy");
if (ind > 0) {
var baseURI = words.slice(0, ind + 1).join('/') + '/' + appId + '/static/executorspage-template.html';
return baseURI;
}
ind = words.indexOf("history");
if(ind > 0) {
var baseURI = words.slice(0, ind).join('/') + '/static/executorspage-template.html';
return baseURI;
}
return location.origin + "/static/executorspage-template.html";
}

function getStandAloneppId(cb) {
var words = document.baseURI.split('/');
var ind = words.indexOf("proxy");
if (ind > 0) {
var appId = words[ind + 1];
cb(appId);
return;
}
ind = words.indexOf("history");
if (ind > 0) {
var appId = words[ind + 1];
cb(appId);
return;
}
//Looks like Web UI is running in standalone mode
//Let's get application-id using REST End Point
$.getJSON(location.origin + "/api/v1/applications", function(response, status, jqXHR) {
if (response && response.length > 0) {
var appId = response[0].id
cb(appId);
return;
}
});
}

function createRESTEndPoint(appId) {
var words = document.baseURI.split('/');
var ind = words.indexOf("proxy");
Expand All @@ -115,16 +75,6 @@ function createRESTEndPoint(appId) {
return location.origin + "/api/v1/applications/" + appId + "/allexecutors";
}

function formatLogsCells(execLogs, type) {
if (type !== 'display') return Object.keys(execLogs);
if (!execLogs) return;
var result = '';
$.each(execLogs, function (logName, logUrl) {
result += '<div><a href=' + logUrl + '>' + logName + '</a></div>'
});
return result;
}

function logsExist(execs) {
return execs.some(function(exec) {
return !($.isEmptyObject(exec["executorLogs"]));
Expand Down Expand Up @@ -172,15 +122,11 @@ function totalDurationColor(totalGCTime, totalDuration) {
}

$(document).ready(function () {
$.extend($.fn.dataTable.defaults, {
stateSave: true,
lengthMenu: [[20, 40, 60, 100, -1], [20, 40, 60, 100, "All"]],
pageLength: 20
});
setDataTableDefaults();

executorsSummary = $("#active-executors");

getStandAloneppId(function (appId) {
getStandAloneAppId(function (appId) {

var endPoint = createRESTEndPoint(appId);
$.getJSON(endPoint, function (response, status, jqXHR) {
Expand Down Expand Up @@ -402,7 +348,7 @@ $(document).ready(function () {
};

var data = {executors: response, "execSummary": [activeSummary, deadSummary, totalSummary]};
$.get(createTemplateURI(appId), function (template) {
$.get(createTemplateURI(appId, "executorspage"), function (template) {

executorsSummary.append(Mustache.render($(template).filter("#executors-summary-template").html(), data));
var selector = "#active-executors-table";
Expand Down
5 changes: 0 additions & 5 deletions core/src/main/resources/org/apache/spark/ui/static/historypage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,6 @@ function makeIdNumeric(id) {
return resl;
}

function formatDate(date) {
if (date <= 0) return "-";
else return date.split(".")[0].replace("T", " ");
}

function getParameterByName(name, searchString) {
var regex = new RegExp("[\\?&]" + name + "=([^&#]*)"),
results = regex.exec(searchString);
Expand Down
Loading