Skip to content
Closed
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
082f709
Added Timeline-View feature for Applications, Jobs and Stages
sarutak Apr 1, 2015
5ce1b21
Added vis.min.js, vis.min.css and vis.map to .rat-exclude
sarutak Apr 1, 2015
a76e569
Removed unused setting in timeline-view.css
sarutak Apr 1, 2015
e85e9aa
Cleanup: Added TimelineViewUtils.scala
sarutak Apr 2, 2015
d05f2c2
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 3, 2015
9fb522e
Cleanuped
sarutak Apr 3, 2015
16f82cf
Cleanuped
sarutak Apr 3, 2015
09cce97
Cleanuped
sarutak Apr 3, 2015
dab7cc1
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 3, 2015
fcdab7d
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 6, 2015
dec85db
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 8, 2015
52b5f0b
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 10, 2015
68b7540
Merge branch 'timeline-viewer-feature' of github.com:sarutak/spark in…
sarutak Apr 10, 2015
19815ae
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 14, 2015
0fc6a31
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 16, 2015
999ccd4
Improved scalability
sarutak Apr 21, 2015
fc1696c
Merge branch 'timeline-viewer-feature' of github.com:sarutak/spark in…
sarutak Apr 22, 2015
aeed4b1
Removed stage timeline
sarutak Apr 22, 2015
8f88222
Added job/stage description
sarutak Apr 22, 2015
6693f34
Added link to job/stage box in the timeline in order to move to corre…
sarutak Apr 22, 2015
6a91872
Temporary commit
sarutak Apr 23, 2015
ee7a7f0
Refactored
sarutak Apr 23, 2015
974a64a
Removed unused function
sarutak Apr 23, 2015
8110acf
Added scroll limit to Job timeline
sarutak Apr 23, 2015
0dc4278
Addressed most of Patrics's feedbacks
sarutak Apr 23, 2015
28714b6
Fixed highlight issue
sarutak Apr 23, 2015
a36291b
Merge branch 'master' of https://github.com/apache/spark into timelin…
sarutak Apr 24, 2015
d3c63c8
Fixed a little bit bugs
sarutak Apr 24, 2015
b09d0c5
Move `stroke` and `fill` attribute of rect elements to css
sarutak Apr 24, 2015
ef34a5b
Implement tooltip using bootstrap
sarutak Apr 24, 2015
a91abd3
Merge branch 'master' of https://github.com/apache/spark into timelin…
sarutak Apr 27, 2015
79ac03d
Merge branch 'master' of git://git.apache.org/spark into timeline-vie…
sarutak Apr 29, 2015
11fe67d
Fixed conflict
sarutak May 1, 2015
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
3 changes: 3 additions & 0 deletions .rat-excludes
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ log4j-defaults.properties
bootstrap-tooltip.js
jquery-1.11.1.min.js
sorttable.js
vis.min.js
vis.min.css
vis.map
.*avsc
.*txt
.*json
Expand Down
114 changes: 114 additions & 0 deletions core/src/main/resources/org/apache/spark/ui/static/timeline-view.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
/*
* 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.
*/

div#application-timeline, div#job-timeline {
margin-bottom: 30px;
}

#application-timeline div.legend-area {
margin-top: 20px;
}

.vis.timeline div.content {
width: 100%;
}

.vis.timeline .item.stage.succeeded {
background-color: #D5DDF6;
}

.vis.timeline .item.stage.succeeded.selected {
background-color: #D5DDF6;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.stage {
cursor: pointer;
}

.vis.timeline .item.stage.failed {
background-color: #FF5475;
}

.vis.timeline .item.stage.failed.selected {
background-color: #FF5475;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.stage.running {
background-color: #FDFFCA;
}

.vis.timeline .item.stage.running.selected {
background-color: #FDFFCA;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.job {
cursor: pointer;
}

.vis.timeline .item.job.succeeded {
background-color: #D5DDF6;
}

.vis.timeline .item.job.succeeded.selected {
background-color: #D5DDF6;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.job.failed {
background-color: #FF5475;
}

.vis.timeline .item.job.failed.selected {
background-color: #FF5475;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.job.running {
background-color: #FDFFCA;
}

.vis.timeline .item.job.running.selected {
background-color: #FDFFCA;
border-color: #97B0F8;
z-index: auto;
}

.vis.timeline .item.executor.added {
background-color: #D5DDF6;
}

.vis.timeline .item.executor.removed {
background-color: #EBCA59;
}

.vis.timeline .item.executor.selected {
border-color: #FFC200;
background-color: #FFF785;
z-index: 2;
}

tr.corresponding-item-hover {
background: #FFE1FA !important;
}
117 changes: 117 additions & 0 deletions core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
* 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.
*/

function drawApplicationTimeline(groupArray, eventObjArray, startTime) {
var groups = new vis.DataSet(groupArray);
var items = new vis.DataSet(eventObjArray);
var container = $("#application-timeline")[0];
var options = {
groupOrder: function(a, b) {
return a.value - b.value
},
editable: false,
showCurrentTime: false,
min: startTime,
zoomable: false
};

var applicationTimeline = new vis.Timeline(container);
applicationTimeline.setOptions(options);
applicationTimeline.setGroups(groups);
applicationTimeline.setItems(items);

setupZoomable("#application-timeline-zoom-lock", applicationTimeline);

$(".item.range.job.application-timeline-object").each(function() {
var getJobId = function(baseElem) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make it so that when I hover over the element I get a tooltip that has the contents contained in the cell? I noticed the contents are not readable when they job is really short. We are already using a tooltip library in the library, so it should be possible to use the existing one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In current implementation, when you hover the element, title will appear and it has the contents (but not use the tooltip library).

var jobIdText = $($(baseElem).find(".application-timeline-content")[0]).text();
var jobId = "#job-" + jobIdText.match("\\(Job (\\d+)\\)")[1];
return jobId;
}

$(this).click(function() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to use javascript so there is a pointer when I mouse over the object.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it would be nice if, when I mouse over, the border of the table cell gets thicker or is higlighted in some way.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've implemented tooltip using existing tooltip library.

window.location.href = getJobId(this);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After thinking about it more - I think this should link to the actual job page (since we have the highlighting now) rather than the job anchor on this page.

});

$(this).hover(
function() {
$(getJobId(this)).addClass("corresponding-item-hover");
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only seems to work for rows that are white background in the jobs table, not the rows that are gray background (I tried it locally with the UIWorkloadGenerator).

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I fixed this bug.

},
function() {
$(getJobId(this)).removeClass("corresponding-item-hover");
}
);
});
}

function drawJobTimeline(groupArray, eventObjArray, startTime) {
var groups = new vis.DataSet(groupArray);
var items = new vis.DataSet(eventObjArray);
var container = $('#job-timeline')[0];
var options = {
groupOrder: function(a, b) {
return a.value - b.value;
},
editable: false,
showCurrentTime: false,
min: startTime,
zoomable: false,
};

var jobTimeline = new vis.Timeline(container);
jobTimeline.setOptions(options);
jobTimeline.setGroups(groups);
jobTimeline.setItems(items);

setupZoomable("#job-timeline-zoom-lock", jobTimeline);

$(".item.range.stage.job-timeline-object").each(function() {

var getStageId = function(baseElem) {
var stageIdText = $($(baseElem).find(".job-timeline-content")[0]).text();
var stageId = "#stage-" + stageIdText.match("\\(Stage (\\d+\\.\\d+)\\)")[1].replace(".", "-");
return stageId;
}

$(this).click(function() {
window.location.href = getStageId(this);
});

$(this).hover(
function() {
$(getStageId(this)).addClass("corresponding-item-hover");
},
function() {
$(getStageId(this)).removeClass("corresponding-item-hover");
}
);
});
}

function setupZoomable(id, timeline) {
$(id + '>input[type="checkbox"]').click(function() {
if (this.checked) {
timeline.setOptions({zoomable: false});
} else {
timeline.setOptions({zoomable: true});
}
});

$(id + ">span").click(function() {
$(this).parent().find('input:checkbox').trigger('click');
});
}
1 change: 1 addition & 0 deletions core/src/main/resources/org/apache/spark/ui/static/vis.map

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 39 additions & 0 deletions core/src/main/resources/org/apache/spark/ui/static/vis.min.js

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions core/src/main/scala/org/apache/spark/scheduler/StageInfo.scala
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,18 @@ class StageInfo(
failureReason = Some(reason)
completionTime = Some(System.currentTimeMillis)
}

private[spark] def getStatusString: String = {
if (completionTime.isDefined) {
if (failureReason.isDefined) {
"failed"
} else {
"succeeded"
}
} else {
"running"
}
}
}

private[spark] object StageInfo {
Expand Down
5 changes: 5 additions & 0 deletions core/src/main/scala/org/apache/spark/ui/UIUtils.scala
Original file line number Diff line number Diff line change
Expand Up @@ -159,12 +159,17 @@ private[spark] object UIUtils extends Logging {
type="text/css" />
<link rel="stylesheet" href={prependBaseUri("/static/webui.css")}
type="text/css" />
<link rel="stylesheet" href={prependBaseUri("/static/vis.min.css")}
typ="text/css" />
<link rel="stylesheet" href={prependBaseUri("/static/timeline-view.css")}></link>
<script src={prependBaseUri("/static/sorttable.js")} ></script>
<script src={prependBaseUri("/static/jquery-1.11.1.min.js")}></script>
<script src={prependBaseUri("/static/vis.min.js")}></script>
<script src={prependBaseUri("/static/bootstrap-tooltip.js")}></script>
<script src={prependBaseUri("/static/initialize-tooltips.js")}></script>
<script src={prependBaseUri("/static/table.js")}></script>
<script src={prependBaseUri("/static/additional-metrics.js")}></script>
<script src={prependBaseUri("/static/timeline-view.js")}></script>
}

/** Returns a spark page with correctly formatted headers */
Expand Down
Loading