From 1fc1ba05d21d9732e8c80273d13792a2879c8f1f Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Fri, 11 Jul 2014 18:08:26 -0700 Subject: [PATCH 1/2] Modify for SPARK-1667 --- core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 2 ++ core/src/main/scala/org/apache/spark/util/Utils.scala | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala index 9930c717492f..28ac84468b3f 100644 --- a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala @@ -99,6 +99,8 @@ private[spark] object AkkaUtils extends Logging { |akka.remote.log-remote-lifecycle-events = $lifecycleEvents |akka.log-dead-letters = $lifecycleEvents |akka.log-dead-letters-during-shutdown = $lifecycleEvents + |akka.actor.debug.recieve on + |akka.loglevel "DEBUG" """.stripMargin)) val actorSystem = ActorSystem(name, akkaConf) 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 a2454e120a8a..c186d0447442 100644 --- a/core/src/main/scala/org/apache/spark/util/Utils.scala +++ b/core/src/main/scala/org/apache/spark/util/Utils.scala @@ -1223,6 +1223,8 @@ private[spark] object Utils extends Logging { /** Returns true if the given exception was fatal. See docs for scala.util.control.NonFatal. */ def isFatalError(e: Throwable): Boolean = { e match { + case _: IOException => + true case NonFatal(_) | _: InterruptedException | _: NotImplementedError | _: ControlThrowable => false case _ => From c2044d6a53e7767b89c46f92ad5cec4635602bac Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Fri, 11 Jul 2014 19:31:55 -0700 Subject: [PATCH 2/2] Modified Utils.scala to handle IOException as fatal --- core/src/main/scala/org/apache/spark/util/AkkaUtils.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala index 28ac84468b3f..9930c717492f 100644 --- a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala +++ b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala @@ -99,8 +99,6 @@ private[spark] object AkkaUtils extends Logging { |akka.remote.log-remote-lifecycle-events = $lifecycleEvents |akka.log-dead-letters = $lifecycleEvents |akka.log-dead-letters-during-shutdown = $lifecycleEvents - |akka.actor.debug.recieve on - |akka.loglevel "DEBUG" """.stripMargin)) val actorSystem = ActorSystem(name, akkaConf)