[SPARK-13241][WEB UI] Added long values for dates in ApplicationAttemptInfo API

## What changes were proposed in this pull request?

Adding long values for each Date in the ApplicationAttemptInfo API for easier use in code

## How was the this patch tested?

Tested with dev/run-tests

Author: Alex Bozarth <ajbozart@us.ibm.com>

Closes #11326 from ajbozarth/spark13241.
This commit is contained in:
Alex Bozarth 2016-04-01 16:18:09 -07:00 committed by Sean Owen
parent 19f32f2d99
commit abc6c42c2d
9 changed files with 92 additions and 2 deletions

View file

@ -38,7 +38,11 @@ class ApplicationAttemptInfo private[spark](
val lastUpdated: Date, val lastUpdated: Date,
val duration: Long, val duration: Long,
val sparkUser: String, val sparkUser: String,
val completed: Boolean = false) val completed: Boolean = false) {
def getStartTimeEpoch: Long = startTime.getTime
def getEndTimeEpoch: Long = endTime.getTime
def getLastUpdatedEpoch: Long = lastUpdated.getTime
}
class ExecutorStageSummary private[spark]( class ExecutorStageSummary private[spark](
val taskTime : Long, val taskTime : Long,

View file

@ -2,6 +2,9 @@
"id" : "local-1430917381534", "id" : "local-1430917381534",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917391398,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:11.398GMT", "endTime" : "2015-05-06T13:03:11.398GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -14,6 +17,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917380950,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:00.950GMT", "endTime" : "2015-05-06T13:03:00.950GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -22,6 +28,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1430917380880,
"endTimeEpoch" : 1430917380890,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.880GMT", "startTime" : "2015-05-06T13:03:00.880GMT",
"endTime" : "2015-05-06T13:03:00.890GMT", "endTime" : "2015-05-06T13:03:00.890GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -34,6 +43,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1426633910242,
"endTimeEpoch" : 1426633945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-17T23:11:50.242GMT", "startTime" : "2015-03-17T23:11:50.242GMT",
"endTime" : "2015-03-17T23:12:25.177GMT", "endTime" : "2015-03-17T23:12:25.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -42,6 +54,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1426533910242,
"endTimeEpoch" : 1426533945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-16T19:25:10.242GMT", "startTime" : "2015-03-16T19:25:10.242GMT",
"endTime" : "2015-03-16T19:25:45.177GMT", "endTime" : "2015-03-16T19:25:45.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -53,6 +68,9 @@
"id" : "local-1425081759269", "id" : "local-1425081759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1425081758277,
"endTimeEpoch" : 1425081766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-28T00:02:38.277GMT", "startTime" : "2015-02-28T00:02:38.277GMT",
"endTime" : "2015-02-28T00:02:46.912GMT", "endTime" : "2015-02-28T00:02:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -64,6 +82,9 @@
"id" : "local-1422981780767", "id" : "local-1422981780767",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981779720,
"endTimeEpoch" : 1422981788731,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:59.720GMT", "startTime" : "2015-02-03T16:42:59.720GMT",
"endTime" : "2015-02-03T16:43:08.731GMT", "endTime" : "2015-02-03T16:43:08.731GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -75,6 +96,9 @@
"id" : "local-1422981759269", "id" : "local-1422981759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981758277,
"endTimeEpoch" : 1422981766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:38.277GMT", "startTime" : "2015-02-03T16:42:38.277GMT",
"endTime" : "2015-02-03T16:42:46.912GMT", "endTime" : "2015-02-03T16:42:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -2,6 +2,9 @@
"id" : "local-1430917381534", "id" : "local-1430917381534",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917391398,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:11.398GMT", "endTime" : "2015-05-06T13:03:11.398GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -14,6 +17,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917380950,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:00.950GMT", "endTime" : "2015-05-06T13:03:00.950GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -22,6 +28,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1430917380880,
"endTimeEpoch" : 1430917380890,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.880GMT", "startTime" : "2015-05-06T13:03:00.880GMT",
"endTime" : "2015-05-06T13:03:00.890GMT", "endTime" : "2015-05-06T13:03:00.890GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -34,6 +43,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1426633910242,
"endTimeEpoch" : 1426633945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-17T23:11:50.242GMT", "startTime" : "2015-03-17T23:11:50.242GMT",
"endTime" : "2015-03-17T23:12:25.177GMT", "endTime" : "2015-03-17T23:12:25.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -42,6 +54,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1426533910242,
"endTimeEpoch" : 1426533945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-16T19:25:10.242GMT", "startTime" : "2015-03-16T19:25:10.242GMT",
"endTime" : "2015-03-16T19:25:45.177GMT", "endTime" : "2015-03-16T19:25:45.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -53,6 +68,9 @@
"id" : "local-1425081759269", "id" : "local-1425081759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1425081758277,
"endTimeEpoch" : 1425081766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-28T00:02:38.277GMT", "startTime" : "2015-02-28T00:02:38.277GMT",
"endTime" : "2015-02-28T00:02:46.912GMT", "endTime" : "2015-02-28T00:02:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -64,6 +82,9 @@
"id" : "local-1422981780767", "id" : "local-1422981780767",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981779720,
"endTimeEpoch" : 1422981788731,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:59.720GMT", "startTime" : "2015-02-03T16:42:59.720GMT",
"endTime" : "2015-02-03T16:43:08.731GMT", "endTime" : "2015-02-03T16:43:08.731GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -75,6 +96,9 @@
"id" : "local-1422981759269", "id" : "local-1422981759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981758277,
"endTimeEpoch" : 1422981766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:38.277GMT", "startTime" : "2015-02-03T16:42:38.277GMT",
"endTime" : "2015-02-03T16:42:46.912GMT", "endTime" : "2015-02-03T16:42:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -2,6 +2,9 @@
"id" : "local-1422981759269", "id" : "local-1422981759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981758277,
"endTimeEpoch" : 1422981766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:38.277GMT", "startTime" : "2015-02-03T16:42:38.277GMT",
"endTime" : "2015-02-03T16:42:46.912GMT", "endTime" : "2015-02-03T16:42:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -2,6 +2,9 @@
"id" : "local-1422981780767", "id" : "local-1422981780767",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981779720,
"endTimeEpoch" : 1422981788731,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:59.720GMT", "startTime" : "2015-02-03T16:42:59.720GMT",
"endTime" : "2015-02-03T16:43:08.731GMT", "endTime" : "2015-02-03T16:43:08.731GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -13,6 +16,9 @@
"id" : "local-1422981759269", "id" : "local-1422981759269",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981758277,
"endTimeEpoch" : 1422981766912,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:38.277GMT", "startTime" : "2015-02-03T16:42:38.277GMT",
"endTime" : "2015-02-03T16:42:46.912GMT", "endTime" : "2015-02-03T16:42:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -2,6 +2,9 @@
"id" : "local-1430917381534", "id" : "local-1430917381534",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917391398,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:11.398GMT", "endTime" : "2015-05-06T13:03:11.398GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -14,6 +17,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1430917380893,
"endTimeEpoch" : 1430917380950,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.893GMT", "startTime" : "2015-05-06T13:03:00.893GMT",
"endTime" : "2015-05-06T13:03:00.950GMT", "endTime" : "2015-05-06T13:03:00.950GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -22,6 +28,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1430917380880,
"endTimeEpoch" : 1430917380890,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-05-06T13:03:00.880GMT", "startTime" : "2015-05-06T13:03:00.880GMT",
"endTime" : "2015-05-06T13:03:00.890GMT", "endTime" : "2015-05-06T13:03:00.890GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -34,6 +43,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1426633910242,
"endTimeEpoch" : 1426633945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-17T23:11:50.242GMT", "startTime" : "2015-03-17T23:11:50.242GMT",
"endTime" : "2015-03-17T23:12:25.177GMT", "endTime" : "2015-03-17T23:12:25.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -42,6 +54,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1426533910242,
"endTimeEpoch" : 1426533945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-16T19:25:10.242GMT", "startTime" : "2015-03-16T19:25:10.242GMT",
"endTime" : "2015-03-16T19:25:45.177GMT", "endTime" : "2015-03-16T19:25:45.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -54,6 +69,9 @@
"name": "Spark shell", "name": "Spark shell",
"attempts": [ "attempts": [
{ {
"startTimeEpoch" : 1425081758277,
"endTimeEpoch" : 1425081766912,
"lastUpdatedEpoch" : 0,
"startTime": "2015-02-28T00:02:38.277GMT", "startTime": "2015-02-28T00:02:38.277GMT",
"endTime": "2015-02-28T00:02:46.912GMT", "endTime": "2015-02-28T00:02:46.912GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -2,6 +2,9 @@
"id" : "local-1422981780767", "id" : "local-1422981780767",
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"startTimeEpoch" : 1422981779720,
"endTimeEpoch" : 1422981788731,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-02-03T16:42:59.720GMT", "startTime" : "2015-02-03T16:42:59.720GMT",
"endTime" : "2015-02-03T16:43:08.731GMT", "endTime" : "2015-02-03T16:43:08.731GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -3,6 +3,9 @@
"name" : "Spark shell", "name" : "Spark shell",
"attempts" : [ { "attempts" : [ {
"attemptId" : "2", "attemptId" : "2",
"startTimeEpoch" : 1426633910242,
"endTimeEpoch" : 1426633945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-17T23:11:50.242GMT", "startTime" : "2015-03-17T23:11:50.242GMT",
"endTime" : "2015-03-17T23:12:25.177GMT", "endTime" : "2015-03-17T23:12:25.177GMT",
"lastUpdated" : "", "lastUpdated" : "",
@ -11,6 +14,9 @@
"completed" : true "completed" : true
}, { }, {
"attemptId" : "1", "attemptId" : "1",
"startTimeEpoch" : 1426533910242,
"endTimeEpoch" : 1426533945177,
"lastUpdatedEpoch" : 0,
"startTime" : "2015-03-16T19:25:10.242GMT", "startTime" : "2015-03-16T19:25:10.242GMT",
"endTime" : "2015-03-16T19:25:45.177GMT", "endTime" : "2015-03-16T19:25:45.177GMT",
"lastUpdated" : "", "lastUpdated" : "",

View file

@ -162,7 +162,9 @@ class HistoryServerSuite extends SparkFunSuite with BeforeAndAfter with Matchers
val json = if (jsonOrg.indexOf("lastUpdated") >= 0) { val json = if (jsonOrg.indexOf("lastUpdated") >= 0) {
val subStrings = jsonOrg.split(",") val subStrings = jsonOrg.split(",")
for (i <- subStrings.indices) { for (i <- subStrings.indices) {
if (subStrings(i).indexOf("lastUpdated") >= 0) { if (subStrings(i).indexOf("lastUpdatedEpoch") >= 0) {
subStrings(i) = subStrings(i).replaceAll("(\\d+)", "0")
} else if (subStrings(i).indexOf("lastUpdated") >= 0) {
subStrings(i) = "\"lastUpdated\":\"\"" subStrings(i) = "\"lastUpdated\":\"\""
} }
} }