You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by rx...@apache.org on 2014/04/24 06:59:39 UTC
git commit: [Hot Fix #469] Fix flaky test in SparkListenerSuite
Repository: spark
Updated Branches:
refs/heads/master 640f9a0ef -> 4b2bab1d0
[Hot Fix #469] Fix flaky test in SparkListenerSuite
The two modified tests may fail if the race condition does not bid in our favor...
Author: Andrew Or <an...@gmail.com>
Closes #516 from andrewor14/stage-info-test-fix and squashes the following commits:
b4b6100 [Andrew Or] Add/replace missing waitUntilEmpty() calls to listener bus
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/4b2bab1d
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/4b2bab1d
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/4b2bab1d
Branch: refs/heads/master
Commit: 4b2bab1d08a6b790be94717bbdd643d896d85c16
Parents: 640f9a0
Author: Andrew Or <an...@gmail.com>
Authored: Wed Apr 23 21:59:33 2014 -0700
Committer: Reynold Xin <rx...@apache.org>
Committed: Wed Apr 23 21:59:33 2014 -0700
----------------------------------------------------------------------
.../scala/org/apache/spark/scheduler/SparkListenerSuite.scala | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/4b2bab1d/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
index ab13917..ba048ce 100644
--- a/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
+++ b/core/src/test/scala/org/apache/spark/scheduler/SparkListenerSuite.scala
@@ -50,9 +50,9 @@ class SparkListenerSuite extends FunSuite with LocalSparkContext with ShouldMatc
(1 to 5).foreach { _ => bus.post(SparkListenerJobEnd(0, JobSucceeded)) }
assert(counter.count === 0)
- // Starting listener bus should flush all buffered events (asynchronously, hence the sleep)
+ // Starting listener bus should flush all buffered events
bus.start()
- Thread.sleep(1000)
+ assert(bus.waitUntilEmpty(WAIT_TIMEOUT_MILLIS))
assert(counter.count === 5)
// After listener bus has stopped, posting events should not increment counter
@@ -177,6 +177,7 @@ class SparkListenerSuite extends FunSuite with LocalSparkContext with ShouldMatc
listener.stageInfos.clear()
rdd3.count()
+ assert(sc.listenerBus.waitUntilEmpty(WAIT_TIMEOUT_MILLIS))
listener.stageInfos.size should be {2} // Shuffle map stage + result stage
val stageInfo3 = listener.stageInfos.keys.find(_.stageId == 2).get
stageInfo3.rddInfos.size should be {2} // ShuffledRDD, MapPartitionsRDD