Skip to content

[SPARK-16986][WEB-UI] Converter Started, Completed and Last Updated to client time zone in history page #19640

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
wangyum wants to merge 11 commits into from
Closed

[SPARK-16986][WEB-UI] Converter Started, Completed and Last Updated to client time zone in history page #19640

Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
17bddef
Replace GMT with history server side TimeZone.
wangyum Nov 2, 2017
c7339c8
Support configure time zone.
wangyum Nov 3, 2017
f36023a
Move getTimeZone from SparkHadoopUtil to Util
wangyum Nov 6, 2017
5291d16
getTimeZone -> getHistoryServerTimeZone
wangyum Nov 7, 2017
d9994ea
Add "spark.history.timeZone" to internal/config.
wangyum Nov 8, 2017
7b04e08
Only convert the UI part to client time zone
wangyum Nov 11, 2017
9a40da0
padZeroes
wangyum Nov 13, 2017
cb1db11
Show local time zone
wangyum Nov 14, 2017
4a78965
Fix HistoryServerSuite test error
wangyum Nov 14, 2017
40ec67e
Intl.DateTimeFormat().resolvedOptions().timeZone
wangyum Nov 15, 2017
08f5e68
Intl.DateTimeFormat().resolvedOptions().timeZone
wangyum Nov 15, 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
19 changes: 14 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 @@ -38,8 +38,17 @@ function makeIdNumeric(id) {
}

function formatDate(date) {

@wangyum wangyum Nov 14, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Move to utils.js

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

@cloud-fan cloud-fan Nov 12, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

just for curious, what does a single - mean here? invalid value?

@wangyum wangyum Nov 13, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Yes, invalid value. Maybe we can remove this.

} else {
var dt = new Date(date);
return dt.getFullYear() + "-" +

@cloud-fan cloud-fan Nov 12, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

not familiar with js, does js have something like java SimpleDateFormat?

@wangyum wangyum Nov 13, 2017 •
edited
Loading

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Native Javascript does not support:
https://www.w3schools.com/js/js_date_formats.asp

Use the momentjs library seems too heavy.

("0" + (dt.getMonth() + 1)).slice(-2) + "-" +

@cloud-fan cloud-fan Nov 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

this looks a bit hacky, is there any way in js to print a number to 2 letters?

@wangyum wangyum Nov 13, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

How about this:

function formatDate(date) {
  if (date <= 0) {
    return "-";
  } else {
    var dt = new Date(date);
    return dt.getFullYear() + "-" +
      (dt.getMonth() + 1).toString().padStart(2, "0") + "-" +
      (dt.getDate()).toString().padStart(2, "0") + " " +
      (dt.getHours()).toString().padStart(2, "0") + ":" +
      (dt.getMinutes()).toString().padStart(2, "0") + ":" +
      (dt.getSeconds()).toString().padStart(2, "0");
  }
}

@cloud-fan cloud-fan Nov 13, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

yea much better, .toString().padStart(2, "0") can be a method.

("0" + dt.getDate()).slice(-2) + " " +
("0" + dt.getHours()).slice(-2) + ":" +
("0" + dt.getMinutes()).slice(-2) + ":" +
("0" + dt.getSeconds()).slice(-2);
}
}

function getParameterByName(name, searchString) {
Expand Down Expand Up @@ -129,9 +138,9 @@ $(document).ready(function() {
var num = app["attempts"].length;
for (j in app["attempts"]) {
var attempt = app["attempts"][j];
attempt["startTime"] = formatDate(attempt["startTime"]);
attempt["endTime"] = formatDate(attempt["endTime"]);
attempt["lastUpdated"] = formatDate(attempt["lastUpdated"]);
attempt["startTime"] = formatDate(attempt["startTimeEpoch"]);
attempt["endTime"] = formatDate(attempt["endTimeEpoch"]);
attempt["lastUpdated"] = formatDate(attempt["lastUpdatedEpoch"]);
attempt["log"] = uiRoot + "/api/v1/applications/" + id + "/" +
(attempt.hasOwnProperty("attemptId") ? attempt["attemptId"] + "/" : "") + "logs";
attempt["durationMillisec"] = attempt["duration"];
Expand Down