aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorAlex Bozarth <ajbozart@us.ibm.com>2016-07-13 10:45:06 +0100
committerSean Owen <sowen@cloudera.com>2016-07-13 10:45:06 +0100
commitf156136dae5df38f73a25cf3fb48f98f417ef059 (patch)
treebad1fb900f0f69ff6a73bd077069cbada94d1bfe /core
parentc190d89bd3cf677400c49238498207b87da9ee78 (diff)
downloadspark-f156136dae5df38f73a25cf3fb48f98f417ef059.tar.gz
spark-f156136dae5df38f73a25cf3fb48f98f417ef059.tar.bz2
spark-f156136dae5df38f73a25cf3fb48f98f417ef059.zip
[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 <ajbozart@us.ibm.com> Closes #14141 from ajbozarth/spark16375.
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/status/api/v1/AllJobsResource.scala2
-rw-r--r--core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_1__expectation.json2
-rw-r--r--core/src/test/resources/HistoryServerExpectations/job_list_from_multi_attempt_app_json_2__expectation.json2
-rw-r--r--core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json6
-rw-r--r--core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json2
-rw-r--r--core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json6
-rw-r--r--core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json4
7 files changed, 12 insertions, 12 deletions
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 b21d36d4a8..d0d9ef1165 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,
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 bb6bf434be..c108fa61a4 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,
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 bb6bf434be..c108fa61a4 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,
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 1583e5ddef..3d7407004d 100644
--- a/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
+++ b/core/src/test/resources/HistoryServerExpectations/job_list_json_expectation.json
@@ -6,7 +6,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
@@ -20,7 +20,7 @@
"numTasks" : 16,
"numActiveTasks" : 0,
"numCompletedTasks" : 15,
- "numSkippedTasks" : 15,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 1,
"numActiveStages" : 0,
"numCompletedStages" : 1,
@@ -34,7 +34,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
diff --git a/core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json b/core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json
index f1f0ec8855..10c7e1c0b3 100644
--- a/core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json
+++ b/core/src/test/resources/HistoryServerExpectations/one_job_json_expectation.json
@@ -6,7 +6,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
diff --git a/core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json b/core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json
index 1583e5ddef..3d7407004d 100644
--- a/core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json
+++ b/core/src/test/resources/HistoryServerExpectations/succeeded_failed_job_list_json_expectation.json
@@ -6,7 +6,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
@@ -20,7 +20,7 @@
"numTasks" : 16,
"numActiveTasks" : 0,
"numCompletedTasks" : 15,
- "numSkippedTasks" : 15,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 1,
"numActiveStages" : 0,
"numCompletedStages" : 1,
@@ -34,7 +34,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
diff --git a/core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json b/core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json
index c232c98323..6a9bafd6b2 100644
--- a/core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json
+++ b/core/src/test/resources/HistoryServerExpectations/succeeded_job_list_json_expectation.json
@@ -6,7 +6,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,
@@ -20,7 +20,7 @@
"numTasks" : 8,
"numActiveTasks" : 0,
"numCompletedTasks" : 8,
- "numSkippedTasks" : 8,
+ "numSkippedTasks" : 0,
"numFailedTasks" : 0,
"numActiveStages" : 0,
"numCompletedStages" : 1,