Skip to content

[SPARK-32886][WEBUI] fix 'undefined' link in event timeline view #29757

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
zhli1142015 wants to merge 4 commits into from
Closed

[SPARK-32886][WEBUI] fix 'undefined' link in event timeline view #29757

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
970c2f5
fix 'undefined' link in event timeline view
zhli1142015 Sep 15, 2020
00f5c60
minor change
zhli1142015 Sep 15, 2020
b243dc3
address comments
zhli1142015 Sep 15, 2020
40d94f6
minor change
zhli1142015 Sep 18, 2020
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
55 changes: 35 additions & 20 deletions core/src/main/resources/org/apache/spark/ui/static/timeline-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,26 +42,32 @@ function drawApplicationTimeline(groupArray, eventObjArray, startTime, offset) {
setupZoomable("#application-timeline-zoom-lock", applicationTimeline);
setupExecutorEventAction();

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

@sarutak sarutak Sep 18, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

nit: ; is not needed at the end of functions here and other new functions you added.

@zhli1142015 zhli1142015 Sep 18, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@sarutak , good catch, removed them, thanks.


function getSelectorForJobEntry(jobId) {
return "#job-" + jobId;
};

function setupJobEventAction() {
$(".vis-item.vis-range.job.application-timeline-object").each(function() {
var getSelectorForJobEntry = function(baseElem) {
var jobIdText = $($(baseElem).find(".application-timeline-content")[0]).text();
var jobId = jobIdText.match("\\(Job (\\d+)\\)$")[1];
return "#job-" + jobId;
};

$(this).click(function() {
var jobPagePath = $(getSelectorForJobEntry(this)).find("a.name-link").attr("href");
window.location.href = jobPagePath
var jobId = getIdForJobEntry(this);
// trim last '/' if exists and append '/job/' segment and id
var jobPagePath = window.location.pathname.replace(/\/$/, "/job/?id=" + jobId);

@sarutak sarutak Sep 18, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It might be better to use the same logic as this to build paths.

@zhli1142015 zhli1142015 Sep 18, 2020

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

agreed, this should be a better approach, updated.

window.location.href = jobPagePath;
});

$(this).hover(
function() {
$(getSelectorForJobEntry(this)).addClass("corresponding-item-hover");
$(getSelectorForJobEntry(getIdForJobEntry(this))).addClass("corresponding-item-hover");
$($(this).find("div.application-timeline-content")[0]).tooltip("show");
},
function() {
$(getSelectorForJobEntry(this)).removeClass("corresponding-item-hover");
$(getSelectorForJobEntry(getIdForJobEntry(this))).removeClass("corresponding-item-hover");
$($(this).find("div.application-timeline-content")[0]).tooltip("hide");
}
);
Expand Down Expand Up @@ -125,26 +131,35 @@ function drawJobTimeline(groupArray, eventObjArray, startTime, offset) {
setupZoomable("#job-timeline-zoom-lock", jobTimeline);
setupExecutorEventAction();

function getStageIdAndAttemptForStageEntry(baseElem) {
var stageIdText = $($(baseElem).find(".job-timeline-content")[0]).text();
var stageIdAndAttempt = stageIdText.match("\\(Stage (\\d+\\.\\d+)\\)$")[1].split(".");
return stageIdAndAttempt;
};

function getSelectorForStageEntry(stageIdAndAttempt) {
return "#stage-" + stageIdAndAttempt[0] + "-" + stageIdAndAttempt[1];
};

function setupStageEventAction() {
$(".vis-item.vis-range.stage.job-timeline-object").each(function() {
var getSelectorForStageEntry = function(baseElem) {
var stageIdText = $($(baseElem).find(".job-timeline-content")[0]).text();
var stageIdAndAttempt = stageIdText.match("\\(Stage (\\d+\\.\\d+)\\)$")[1].split(".");
return "#stage-" + stageIdAndAttempt[0] + "-" + stageIdAndAttempt[1];
};

$(this).click(function() {
var stagePagePath = $(getSelectorForStageEntry(this)).find("a.name-link").attr("href")
window.location.href = stagePagePath
var stageIdAndAttempt = getStageIdAndAttemptForStageEntry(this);
var stagePagePath = window.location.pathname.replace(
/\/jobs\/job(.*)/g,
"/stages/stage/?id=" + stageIdAndAttempt[0] + "&attempt=" + stageIdAndAttempt[1]);
window.location.href = stagePagePath;
});

$(this).hover(
function() {
$(getSelectorForStageEntry(this)).addClass("corresponding-item-hover");
$(getSelectorForStageEntry(getStageIdAndAttemptForStageEntry(this)))
.addClass("corresponding-item-hover");
$($(this).find("div.job-timeline-content")[0]).tooltip("show");
},
function() {
$(getSelectorForStageEntry(this)).removeClass("corresponding-item-hover");
$(getSelectorForStageEntry(getStageIdAndAttemptForStageEntry(this)))
.removeClass("corresponding-item-hover");
$($(this).find("div.job-timeline-content")[0]).tooltip("hide");
}
);
Expand Down