Skip to content

[SPARK-34659] Fix that Web UI always correctly get appId #31774

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

[SPARK-34659] Fix that Web UI always correctly get appId #31774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9548338
Fix that Web UI always correctly get appId
ornew Mar 8, 2021
1704e3b
Merge branch 'apache:master' into fix-web-ui-get-correct-app-id
ornew May 26, 2022
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
30 changes: 15 additions & 15 deletions core/src/main/resources/org/apache/spark/ui/static/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,27 +96,27 @@ function formatLogsCells(execLogs, type) {
}

function getStandAloneAppId(cb) {
var words = getBaseURI().split('/');
var ind = words.indexOf("proxy");
var appId;
if (ind > 0) {
appId = words[ind + 1];
cb(appId);
return;
}
ind = words.indexOf("history");
if (ind > 0) {
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(uiRoot + "/api/v1/applications", function(response, status, jqXHR) {
if (response && response.length > 0) {
var appId = response[0].id;
cb(appId);
return;
} else {
var words = document.baseURI.split('/');
Copy link
Member

@gengliangwang gengliangwang Mar 19, 2021

Choose a reason for hiding this comment

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

BTW, have you tested the code changes for Spark UI behind proxy and Spark UI of History server?

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;
}
}
});
}
Expand Down Expand Up @@ -231,4 +231,4 @@ function createRESTEndPointForMiscellaneousProcess(appId) {
function getBaseURI() {
return document.baseURI || document.URL;
}
/* eslint-enable no-unused-vars */
/* eslint-enable no-unused-vars */