aboutsummaryrefslogtreecommitdiff
path: root/yarn
diff options
context:
space:
mode:
authorzsxwing <zsxwing@gmail.com>2015-06-03 15:03:07 -0700
committerAndrew Or <andrew@databricks.com>2015-06-03 15:03:07 -0700
commit1d8669f15c136cd81f494dd487400c62c9498602 (patch)
tree4e9bfa4fbf5c432a3406f62aa26678a1568eeedb /yarn
parentaa40c4420717aa06a7964bd30b428fb73548beb2 (diff)
downloadspark-1d8669f15c136cd81f494dd487400c62c9498602.tar.gz
spark-1d8669f15c136cd81f494dd487400c62c9498602.tar.bz2
spark-1d8669f15c136cd81f494dd487400c62c9498602.zip
[SPARK-8001] [CORE] Make AsynchronousListenerBus.waitUntilEmpty throw TimeoutException if timeout
Some places forget to call `assert` to check the return value of `AsynchronousListenerBus.waitUntilEmpty`. Instead of adding `assert` in these places, I think it's better to make `AsynchronousListenerBus.waitUntilEmpty` throw `TimeoutException`. Author: zsxwing <zsxwing@gmail.com> Closes #6550 from zsxwing/SPARK-8001 and squashes the following commits: 607674a [zsxwing] Make AsynchronousListenerBus.waitUntilEmpty throw TimeoutException if timeout
Diffstat (limited to 'yarn')
-rw-r--r--yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala b/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala
index d8bc2534c1..bc42e12dfa 100644
--- a/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala
+++ b/yarn/src/test/scala/org/apache/spark/deploy/yarn/YarnClusterSuite.scala
@@ -326,7 +326,7 @@ private object YarnClusterDriver extends Logging with Matchers {
var result = "failure"
try {
val data = sc.parallelize(1 to 4, 4).collect().toSet
- assert(sc.listenerBus.waitUntilEmpty(WAIT_TIMEOUT_MILLIS))
+ sc.listenerBus.waitUntilEmpty(WAIT_TIMEOUT_MILLIS)
data should be (Set(1, 2, 3, 4))
result = "success"
} finally {