From 997720518e8c0f0000707c2b2919498dab5a6eee Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Thu, 7 Aug 2014 13:13:31 +0900 Subject: [PATCH 1/2] Removed redundant error notification --- .../scala/org/apache/spark/storage/BlockFetcherIterator.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala b/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala index 938af6f5b923..6e545fa27754 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala @@ -138,9 +138,7 @@ object BlockFetcherIterator { } case Failure(exception) => { logError("Could not get block(s) from " + cmId, exception) - for ((blockId, size) <- req.blocks) { - results.put(new FetchResult(blockId, -1, null)) - } + results.put(new FetchResult(req.blocks(0)._1, -1, null)) } } } From d1d7102fd243964fb84c7e7f7922c6197c594812 Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Sun, 10 Aug 2014 06:23:30 +0900 Subject: [PATCH 2/2] Added comments --- .../org/apache/spark/storage/BlockFetcherIterator.scala | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala b/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala index 6e545fa27754..daa0bb71e150 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockFetcherIterator.scala @@ -138,6 +138,11 @@ object BlockFetcherIterator { } case Failure(exception) => { logError("Could not get block(s) from " + cmId, exception) + /** + * In current implementation, only pass the first element is enough + * because when iterator get FetchResult which size is -1, + * FetchFailedException is thrown immediately. + */ results.put(new FetchResult(req.blocks(0)._1, -1, null)) } }