From acb60afb793596a5703051dd97a6e1a95dd6364c Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Tue, 28 Jun 2016 15:37:47 +0530 Subject: [PATCH 1/2] [SPARK-16251][CORE] LocalCheckpointSuite's - missing checkpoint block fails with informative message is flaky. --- .../org/apache/spark/storage/BlockManagerMasterEndpoint.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala index 8fa12150114db..616eb207c1f90 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala @@ -226,7 +226,7 @@ class BlockManagerMasterEndpoint( // Remove the block from the slave's BlockManager. // Doesn't actually wait for a confirmation and the message might get lost. // If message loss becomes frequent, we should add retry logic here. - blockManager.get.slaveEndpoint.ask[Boolean](RemoveBlock(blockId)) + blockManager.get.slaveEndpoint.askWithRetry[Boolean](RemoveBlock(blockId)) } } } From a7f2f11e7300de28b7b08792d0a4b25dc1e1ea03 Mon Sep 17 00:00:00 2001 From: Prashant Sharma Date: Tue, 28 Jun 2016 16:53:46 +0530 Subject: [PATCH 2/2] changed inline comment appropriately. --- .../org/apache/spark/storage/BlockManagerMasterEndpoint.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala index 616eb207c1f90..d301051e2a044 100644 --- a/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala +++ b/core/src/main/scala/org/apache/spark/storage/BlockManagerMasterEndpoint.scala @@ -224,8 +224,7 @@ class BlockManagerMasterEndpoint( val blockManager = blockManagerInfo.get(blockManagerId) if (blockManager.isDefined) { // Remove the block from the slave's BlockManager. - // Doesn't actually wait for a confirmation and the message might get lost. - // If message loss becomes frequent, we should add retry logic here. + // wait for confirmation. blockManager.get.slaveEndpoint.askWithRetry[Boolean](RemoveBlock(blockId)) } }