spark git commit: [SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to numSkippedTasks

2016-07-13 Thread srowen 
Repository: spark
Updated Branches:
  refs/heads/branch-2.0 4b93a833b -> 5301efc17


[SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to 
numSkippedTasks

## What changes were proposed in this pull request?

I fixed a misassigned var,  numCompletedTasks was assigned to numSkippedTasks 
in the convertJobData method

## How was this patch tested?

dev/run-tests

Author: Alex Bozarth 

Closes #14141 from ajbozarth/spark16375.

(cherry picked from commit f156136dae5df38f73a25cf3fb48f98f417ef059)
Signed-off-by: Sean Owen 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/5301efc1
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/5301efc1
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/5301efc1

Branch: refs/heads/branch-2.0
Commit: 5301efc1779c9d4a14ea1238bbbfa4aab25d3163
Parents: 4b93a83
Author: Alex Bozarth 
Authored: Wed Jul 13 10:45:06 2016 +0100
Committer: Sean Owen 
Committed: Wed Jul 13 10:45:14 2016 +0100

--
 .../scala/org/apache/spark/status/api/v1/AllJobsResource.scala | 2 +-
 .../job_list_from_multi_attempt_app_json_1__expectation.json   | 2 +-
 .../job_list_from_multi_attempt_app_json_2__expectation.json   | 2 +-
 .../HistoryServerExpectations/job_list_json_expectation.json   | 6 +++---
 .../HistoryServerExpectations/one_job_json_expectation.json| 2 +-
 .../succeeded_failed_job_list_json_expectation.json| 6 +++---
 .../succeeded_job_list_json_expectation.json   | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/5301efc1/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
--
diff --git 
a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala 
b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
index b21d36d..d0d9ef1 100644
--- a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
@@ -91,7 +91,7 @@ private[v1] object AllJobsResource {
 numTasks = job.numTasks,
 numActiveTasks = job.numActiveTasks,
 numCompletedTasks = job.numCompletedTasks,
-numSkippedTasks = job.numCompletedTasks,
+numSkippedTasks = job.numSkippedTasks,
 numFailedTasks = job.numFailedTasks,
 numActiveStages = job.numActiveStages,
 numCompletedStages = job.completedStageIndices.size,

http://git-wip-us.apache.org/repos/asf/spark/blob/5301efc1/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
index bb6bf43..c108fa6 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/5301efc1/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
index bb6bf43..c108fa6 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/5301efc1/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
--
diff --git

spark git commit: [SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to numSkippedTasks

2016-07-13 Thread srowen 
Repository: spark
Updated Branches:
  refs/heads/master c190d89bd -> f156136da


[SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to 
numSkippedTasks

## What changes were proposed in this pull request?

I fixed a misassigned var,  numCompletedTasks was assigned to numSkippedTasks 
in the convertJobData method

## How was this patch tested?

dev/run-tests

Author: Alex Bozarth 

Closes #14141 from ajbozarth/spark16375.


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/f156136d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/f156136d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/f156136d

Branch: refs/heads/master
Commit: f156136dae5df38f73a25cf3fb48f98f417ef059
Parents: c190d89
Author: Alex Bozarth 
Authored: Wed Jul 13 10:45:06 2016 +0100
Committer: Sean Owen 
Committed: Wed Jul 13 10:45:06 2016 +0100

--
 .../scala/org/apache/spark/status/api/v1/AllJobsResource.scala | 2 +-
 .../job_list_from_multi_attempt_app_json_1__expectation.json   | 2 +-
 .../job_list_from_multi_attempt_app_json_2__expectation.json   | 2 +-
 .../HistoryServerExpectations/job_list_json_expectation.json   | 6 +++---
 .../HistoryServerExpectations/one_job_json_expectation.json| 2 +-
 .../succeeded_failed_job_list_json_expectation.json| 6 +++---
 .../succeeded_job_list_json_expectation.json   | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/f156136d/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
--
diff --git 
a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala 
b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
index b21d36d..d0d9ef1 100644
--- a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
@@ -91,7 +91,7 @@ private[v1] object AllJobsResource {
 numTasks = job.numTasks,
 numActiveTasks = job.numActiveTasks,
 numCompletedTasks = job.numCompletedTasks,
-numSkippedTasks = job.numCompletedTasks,
+numSkippedTasks = job.numSkippedTasks,
 numFailedTasks = job.numFailedTasks,
 numActiveStages = job.numActiveStages,
 numCompletedStages = job.completedStageIndices.size,

http://git-wip-us.apache.org/repos/asf/spark/blob/f156136d/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
index bb6bf43..c108fa6 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/f156136d/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
index bb6bf43..c108fa6 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/f156136d/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
index

spark git commit: [SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to numSkippedTasks

2016-07-13 Thread srowen 
Repository: spark
Updated Branches:
  refs/heads/branch-1.6 980db2bd4 -> fb0933681


[SPARK-16375][WEB UI] Fixed misassigned var: numCompletedTasks was assigned to 
numSkippedTasks

## What changes were proposed in this pull request?

I fixed a misassigned var,  numCompletedTasks was assigned to numSkippedTasks 
in the convertJobData method

## How was this patch tested?

dev/run-tests

Author: Alex Bozarth 

Closes #14141 from ajbozarth/spark16375.

(cherry picked from commit f156136dae5df38f73a25cf3fb48f98f417ef059)
Signed-off-by: Sean Owen 


Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fb093368
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fb093368
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fb093368

Branch: refs/heads/branch-1.6
Commit: fb0933681db199af85543ccb5601b44a4af92321
Parents: 980db2b
Author: Alex Bozarth 
Authored: Wed Jul 13 10:45:06 2016 +0100
Committer: Sean Owen 
Committed: Wed Jul 13 10:45:24 2016 +0100

--
 .../scala/org/apache/spark/status/api/v1/AllJobsResource.scala | 2 +-
 .../job_list_from_multi_attempt_app_json_1__expectation.json   | 2 +-
 .../job_list_from_multi_attempt_app_json_2__expectation.json   | 2 +-
 .../HistoryServerExpectations/job_list_json_expectation.json   | 6 +++---
 .../HistoryServerExpectations/one_job_json_expectation.json| 2 +-
 .../succeeded_failed_job_list_json_expectation.json| 6 +++---
 .../succeeded_job_list_json_expectation.json   | 4 ++--
 7 files changed, 12 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/spark/blob/fb093368/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
--
diff --git 
a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala 
b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
index 5783df5..4ac7b3d 100644
--- a/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
+++ b/core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala
@@ -86,7 +86,7 @@ private[v1] object AllJobsResource {
 numTasks = job.numTasks,
 numActiveTasks = job.numActiveTasks,
 numCompletedTasks = job.numCompletedTasks,
-numSkippedTasks = job.numCompletedTasks,
+numSkippedTasks = job.numSkippedTasks,
 numFailedTasks = job.numFailedTasks,
 numActiveStages = job.numActiveStages,
 numCompletedStages = job.completedStageIndices.size,

http://git-wip-us.apache.org/repos/asf/spark/blob/fb093368/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
index 2e92e1f..1940a60 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/fb093368/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
--
diff --git 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
index 2e92e1f..1940a60 100644
--- 
a/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
+++ 
b/core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json
@@ -6,7 +6,7 @@
   "numTasks" : 8,
   "numActiveTasks" : 0,
   "numCompletedTasks" : 8,
-  "numSkippedTasks" : 8,
+  "numSkippedTasks" : 0,
   "numFailedTasks" : 0,
   "numActiveStages" : 0,
   "numCompletedStages" : 1,

http://git-wip-us.apache.org/repos/asf/spark/blob/fb093368/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
--
diff --git