aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTathagata Das <tathagata.das1565@gmail.com>2014-05-14 21:13:41 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-05-14 21:14:21 -0700
commitba871235f0d01093475547e74a125c10dd2123bb (patch)
tree393c4c80c0a69e0b09ea0851641b63f3d1917f63 /core
parent9f0f2ecb8df110e2504c461209f01ce3ac23c844 (diff)
downloadspark-ba871235f0d01093475547e74a125c10dd2123bb.tar.gz
spark-ba871235f0d01093475547e74a125c10dd2123bb.tar.bz2
spark-ba871235f0d01093475547e74a125c10dd2123bb.zip
[SPARK-1840] SparkListenerBus prints out scary error message when terminated normally
Running SparkPi example gave this error. ``` Pi is roughly 3.14374 14/05/14 18:16:19 ERROR Utils: Uncaught exception in thread SparkListenerBus scala.runtime.NonLocalReturnControl$mcV$sp ``` This is due to the catch-all in the SparkListenerBus, which logged control throwable used by scala system Author: Tathagata Das <tathagata.das1565@gmail.com> Closes #783 from tdas/controlexception-fix and squashes the following commits: a466c8d [Tathagata Das] Ignored control exceptions when logging all exceptions. (cherry picked from commit ad4e60ee7e2c49c24a9972312915f7f7253c7679) Signed-off-by: Patrick Wendell <pwendell@gmail.com>
Diffstat (limited to 'core')
-rw-r--r--core/src/main/scala/org/apache/spark/util/Utils.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/core/src/main/scala/org/apache/spark/util/Utils.scala b/core/src/main/scala/org/apache/spark/util/Utils.scala
index d041bfa66a..388f722242 100644
--- a/core/src/main/scala/org/apache/spark/util/Utils.scala
+++ b/core/src/main/scala/org/apache/spark/util/Utils.scala
@@ -1149,6 +1149,8 @@ private[spark] object Utils extends Logging {
try {
f
} catch {
+ case ct: ControlThrowable =>
+ throw ct
case t: Throwable =>
logError(s"Uncaught exception in thread ${Thread.currentThread().getName}", t)
throw t