spark git commit: [MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and TaskSchedulerImplSuite
Repository: spark
Updated Branches:
refs/heads/branch-2.3 71eb7d468 -> bad56bb7b
[MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and
TaskSchedulerImplSuite
## What changes were proposed in this pull request?
In the `afterEach()` method of both `TastSetManagerSuite` and
`TaskSchedulerImplSuite`, `super.afterEach()` shall be called at the end,
because it shall stop the SparkContext.
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/93706/testReport/org.apache.spark.scheduler/TaskSchedulerImplSuite/_It_is_not_a_test_it_is_a_sbt_testing_SuiteSelector_/
The test failure is caused by the above reason, the newly added
`barrierCoordinator` required `rpcEnv` which has been stopped before
`TaskSchedulerImpl` doing cleanup.
## How was this patch tested?
Existing tests.
Author: Xingbo Jiang
Closes #21908 from jiangxb1987/afterEach.
(cherry picked from commit 3695ba57731a669ed20e7f676edee602c292fbed)
Signed-off-by: hyukjinkwon
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bad56bb7
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bad56bb7
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bad56bb7
Branch: refs/heads/branch-2.3
Commit: bad56bb7b2340d338eac8cea07e9f1bb3e08b1ac
Parents: 71eb7d4
Author: Xingbo Jiang
Authored: Mon Jul 30 09:58:28 2018 +0800
Committer: hyukjinkwon
Committed: Mon Jul 30 09:58:54 2018 +0800
--
.../scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala | 2 +-
.../scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/bad56bb7/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
index 33f2ea1..a9e0aed 100644
---
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
+++
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
@@ -62,7 +62,6 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
}
override def afterEach(): Unit = {
-super.afterEach()
if (taskScheduler != null) {
taskScheduler.stop()
taskScheduler = null
@@ -71,6 +70,7 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
dagScheduler.stop()
dagScheduler = null
}
+super.afterEach()
}
def setupScheduler(confs: (String, String)*): TaskSchedulerImpl = {
http://git-wip-us.apache.org/repos/asf/spark/blob/bad56bb7/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
index b4acccf..d75c245 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
@@ -178,12 +178,12 @@ class TaskSetManagerSuite extends SparkFunSuite with
LocalSparkContext with Logg
}
override def afterEach(): Unit = {
-super.afterEach()
if (sched != null) {
sched.dagScheduler.stop()
sched.stop()
sched = null
}
+super.afterEach()
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and TaskSchedulerImplSuite
Repository: spark
Updated Branches:
refs/heads/branch-2.2 f52d0c451 -> c4b37696f
[MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and
TaskSchedulerImplSuite
## What changes were proposed in this pull request?
In the `afterEach()` method of both `TastSetManagerSuite` and
`TaskSchedulerImplSuite`, `super.afterEach()` shall be called at the end,
because it shall stop the SparkContext.
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/93706/testReport/org.apache.spark.scheduler/TaskSchedulerImplSuite/_It_is_not_a_test_it_is_a_sbt_testing_SuiteSelector_/
The test failure is caused by the above reason, the newly added
`barrierCoordinator` required `rpcEnv` which has been stopped before
`TaskSchedulerImpl` doing cleanup.
## How was this patch tested?
Existing tests.
Author: Xingbo Jiang
Closes #21908 from jiangxb1987/afterEach.
(cherry picked from commit 3695ba57731a669ed20e7f676edee602c292fbed)
Signed-off-by: hyukjinkwon
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c4b37696
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c4b37696
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c4b37696
Branch: refs/heads/branch-2.2
Commit: c4b37696f9551a6429c1d90e53f2499aada556b1
Parents: f52d0c4
Author: Xingbo Jiang
Authored: Mon Jul 30 09:58:28 2018 +0800
Committer: hyukjinkwon
Committed: Mon Jul 30 09:59:15 2018 +0800
--
.../scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala | 2 +-
.../scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/c4b37696/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
index 38a4f40..2da9e17 100644
---
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
+++
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
@@ -62,7 +62,6 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
}
override def afterEach(): Unit = {
-super.afterEach()
if (taskScheduler != null) {
taskScheduler.stop()
taskScheduler = null
@@ -71,6 +70,7 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
dagScheduler.stop()
dagScheduler = null
}
+super.afterEach()
}
def setupScheduler(confs: (String, String)*): TaskSchedulerImpl = {
http://git-wip-us.apache.org/repos/asf/spark/blob/c4b37696/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
index 904f0b6..4d330b5 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
@@ -172,12 +172,12 @@ class TaskSetManagerSuite extends SparkFunSuite with
LocalSparkContext with Logg
}
override def afterEach(): Unit = {
-super.afterEach()
if (sched != null) {
sched.dagScheduler.stop()
sched.stop()
sched = null
}
+super.afterEach()
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
spark git commit: [MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and TaskSchedulerImplSuite
Repository: spark
Updated Branches:
refs/heads/master 2c54aae1b -> 3695ba577
[MINOR][CORE][TEST] Fix afterEach() in TastSetManagerSuite and
TaskSchedulerImplSuite
## What changes were proposed in this pull request?
In the `afterEach()` method of both `TastSetManagerSuite` and
`TaskSchedulerImplSuite`, `super.afterEach()` shall be called at the end,
because it shall stop the SparkContext.
https://amplab.cs.berkeley.edu/jenkins/job/SparkPullRequestBuilder/93706/testReport/org.apache.spark.scheduler/TaskSchedulerImplSuite/_It_is_not_a_test_it_is_a_sbt_testing_SuiteSelector_/
The test failure is caused by the above reason, the newly added
`barrierCoordinator` required `rpcEnv` which has been stopped before
`TaskSchedulerImpl` doing cleanup.
## How was this patch tested?
Existing tests.
Author: Xingbo Jiang
Closes #21908 from jiangxb1987/afterEach.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/3695ba57
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/3695ba57
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/3695ba57
Branch: refs/heads/master
Commit: 3695ba57731a669ed20e7f676edee602c292fbed
Parents: 2c54aae
Author: Xingbo Jiang
Authored: Mon Jul 30 09:58:28 2018 +0800
Committer: hyukjinkwon
Committed: Mon Jul 30 09:58:28 2018 +0800
--
.../scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala | 2 +-
.../scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/3695ba57/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
index 624384a..16c273b 100644
---
a/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
+++
b/core/src/test/scala/org/apache/spark/scheduler/TaskSchedulerImplSuite.scala
@@ -62,7 +62,6 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
}
override def afterEach(): Unit = {
-super.afterEach()
if (taskScheduler != null) {
taskScheduler.stop()
taskScheduler = null
@@ -71,6 +70,7 @@ class TaskSchedulerImplSuite extends SparkFunSuite with
LocalSparkContext with B
dagScheduler.stop()
dagScheduler = null
}
+super.afterEach()
}
def setupScheduler(confs: (String, String)*): TaskSchedulerImpl = {
http://git-wip-us.apache.org/repos/asf/spark/blob/3695ba57/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
--
diff --git
a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
index cf05434..d264ada 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/TaskSetManagerSuite.scala
@@ -178,12 +178,12 @@ class TaskSetManagerSuite extends SparkFunSuite with
LocalSparkContext with Logg
}
override def afterEach(): Unit = {
-super.afterEach()
if (sched != null) {
sched.dagScheduler.stop()
sched.stop()
sched = null
}
+super.afterEach()
}
-
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
