Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 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
b587cf2
initial commit
sarutak May 1, 2015
8f6610c
Fixed conflict
sarutak May 1, 2015
e694b8e
Added timeline view to StagePage
sarutak May 1, 2015
af430f1
Merge branch 'master' of git://git.apache.org/spark into stage-page-t…
sarutak May 1, 2015
2ae8520
Updated bootstrap-tooltip.js from 2.2.2 to 2.3.2
sarutak May 1, 2015
ba1ac3e
Fixed style
sarutak May 1, 2015
385b6d2
Added link feature
sarutak May 1, 2015
2a9e376
Minor cleanup
sarutak May 2, 2015
29eae3e
limited to longest 1000 tasks
sarutak May 12, 2015
55a390c
Ignored scalastyle for a line-comment
sarutak May 12, 2015
a79dcc3
Modified appearance
sarutak May 12, 2015
81903ab
Modified appearances
sarutak May 12, 2015
2319739
Modified appearances more
sarutak May 12, 2015
ac8842b
Fixed layout
sarutak May 13, 2015
b9d8f1b
Fixed performance issue
sarutak May 13, 2015
878e3b8
Fixed a bug that tooltip remains
sarutak May 13, 2015
e4a3354
minor code style change
sarutak May 14, 2015
64e6642
Merge branch 'master' of https://github.com/apache/spark into stage-p…
sarutak May 14, 2015
d5f794a
Fixed performance issues more
sarutak May 14, 2015
7ae328f
Modified code style
sarutak May 14, 2015
16cb2e6
Merge branch 'master' of https://github.com/apache/spark into stage-p…
sarutak May 14, 2015
2e5d605
Modified warning message
sarutak May 14, 2015
16bb552
Removed border of legend area
sarutak May 14, 2015
4ba9604
Fixed the order of legends
sarutak May 14, 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
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,65 @@ div#application-timeline, div#job-timeline {
margin-top: 5px;
}

#task-assignment-timeline div.legend-area {
width: 574px;
}

#task-assignment-timeline .legend-area > svg {
width: 100%;
height: 55px;
}

#task-assignment-timeline div.item.range {
padding: 0px;
height: 26px;
border-width: 0;
}

.task-assignment-timeline-content {
width: 100%;
}

.task-assignment-timeline-duration-bar {
width: 100%;
height: 26px;
}

rect.scheduler-delay-proportion {
fill: #80B1D3;
stroke: #6B94B0;
}

rect.deserialization-time-proportion {
fill: #FB8072;
stroke: #D26B5F;
}

rect.shuffle-read-time-proportion {
fill: #FDB462;
stroke: #D39651;
}

rect.executor-runtime-proportion {
fill: #B3DE69;
stroke: #95B957;
}

rect.shuffle-write-time-proportion {
fill: #FFED6F;
stroke: #D5C65C;
}

rect.serialization-time-proportion {
fill: #BC80BD;
stroke: #9D6B9E;
}

rect.getting-result-time-proportion {
fill: #8DD3C7;
stroke: #75B0A6;
}

.vis.timeline {
line-height: 14px;
}
Expand Down Expand Up @@ -178,6 +237,10 @@ tr.corresponding-item-hover > td, tr.corresponding-item-hover > th {
display: none;
}

#task-assignment-timeline.collapsed {
display: none;
}

.control-panel {
margin-bottom: 5px;
}
Expand All @@ -186,7 +249,8 @@ tr.corresponding-item-hover > td, tr.corresponding-item-hover > th {
margin: 0;
}

span.expand-application-timeline, span.expand-job-timeline {
span.expand-application-timeline, span.expand-job-timeline,
span.expand-task-assignment-timeline {
cursor: pointer;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,73 @@ function drawJobTimeline(groupArray, eventObjArray, startTime) {
});
}

function drawTaskAssignmentTimeline(groupArray, eventObjArray, minLaunchTime, zoomMax) {
var groups = new vis.DataSet(groupArray);
var items = new vis.DataSet(eventObjArray);
var container = $("#task-assignment-timeline")[0]
var options = {
groupOrder: function(a, b) {
return a.value - b.value
},
editable: false,
align: 'left',
selectable: false,
showCurrentTime: false,
min: minLaunchTime,
zoomable: false,
zoomMax: zoomMax
};

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

taskTimeline.on("rangechange", function(prop) {
if (currentDisplayedTooltip !== null) {
$(currentDisplayedTooltip).tooltip("hide");
}
});

function getTaskIdxAndAttempt(selector) {
var taskIdxText = $(selector).attr("data-title");
var taskIdxAndAttempt = taskIdxText.match("Task (\\d+) \\(attempt (\\d+)");
var taskIdx = taskIdxAndAttempt[1];
var taskAttempt = taskIdxAndAttempt[2];
return taskIdx + "-" + taskAttempt;
}

// If we zoom up and a box moves away when the corresponding tooltip is shown,
// the tooltip can be remain.
// So, we need to hide tooltips using another mechanism.
var currentDisplayedTooltip = null;

$("#task-assignment-timeline").on({
"mouseenter": function() {
var taskIdxAndAttempt = getTaskIdxAndAttempt(this);
$("#task-" + taskIdxAndAttempt).addClass("corresponding-item-hover");
$(this).tooltip("show");
currentDisplayedTooltip = this;
},
"mouseleave" : function() {
var taskIdxAndAttempt = getTaskIdxAndAttempt(this);
$("#task-" + taskIdxAndAttempt).removeClass("corresponding-item-hover");
$(this).tooltip("hide");
currentDisplayedTooltip = null;
}
}, ".task-assignment-timeline-content");

setupZoomable('#task-assignment-timeline-zoom-lock', taskTimeline);

$("span.expand-task-assignment-timeline").click(function() {
$("#task-assignment-timeline").toggleClass('collapsed');

// Switch the class of the arrow from open to closed.
$(this).find('.expand-task-assignment-timeline-arrow').toggleClass('arrow-open');
$(this).find('.expand-task-assignment-timeline-arrow').toggleClass('arrow-closed');
});
}

function setupExecutorEventAction() {
$(".item.box.executor").each(function () {
$(this).hover(
Expand All @@ -147,15 +214,15 @@ function setupExecutorEventAction() {
}

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

$(id + ">span").click(function() {
$(id + " > span").click(function() {
$(this).parent().find('input:checkbox').trigger('click');
});
}
Loading