Fail block fetches if client connection fails

apache · Oct 29, 2014 · 4a204b8 · 4a204b8
1 parent 2b0d1c0
commit 4a204b8
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala b/core/src/main/scala/org/apache/spark/network/netty/NettyBlockTransferService.scala
@@ -58,8 +58,14 @@ class NettyBlockTransferService(conf: SparkConf) extends BlockTransferService {
       port: Int,
       blockIds: Seq[String],
       listener: BlockFetchingListener): Unit = {
-    val client = clientFactory.createClient(hostname, port)
-    new NettyBlockFetcher(serializer, client, blockIds, listener).start()
+    try {
+      val client = clientFactory.createClient(hostname, port)
+      new NettyBlockFetcher(serializer, client, blockIds, listener).start()
+    } catch {
+      case e: Exception =>
+        logError("Exception while beginning fetchBlocks", e)
+        blockIds.foreach(listener.onBlockFetchFailure(_, e))
+    }
   }
 
   override def hostName: String = Utils.localHostName()