[SPARK-7236] Fix to prevent AkkaUtils askWithReply from sleeping on final attempt

BryanCutler · BryanCutler · commit 653a07bcb968 · 2015-05-04T12:04:59.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala b/core/src/main/scala/org/apache/spark/util/AkkaUtils.scala
@@ -183,7 +183,9 @@ private[spark] object AkkaUtils extends Logging {
           lastException = e
           logWarning(s"Error sending message [message = $message] in $attempts attempts", e)
       }
-      Thread.sleep(retryInterval)
+      if (attempts < maxAttempts) {
+        Thread.sleep(retryInterval)
+      }
     }
 
     throw new SparkException(

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,9 @@ private[spark] object AkkaUtils extends Logging {`
`183`	`183`	`lastException = e`
`184`	`184`	`logWarning(s"Error sending message [message = $message] in $attempts attempts", e)`
`185`	`185`	`}`
`186`		`- Thread.sleep(retryInterval)`
	`186`	`+ if (attempts < maxAttempts) {`
	`187`	`+ Thread.sleep(retryInterval)`
	`188`	`+ }`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`throw new SparkException(`