[SPARK-6980] Fixed await result not being handled by RpcTimeout

BryanCutler · BryanCutler · commit 23d2f262dafe · 2015-05-17T19:31:42.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/rpc/RpcEnv.scala b/core/src/main/scala/org/apache/spark/rpc/RpcEnv.scala
@@ -97,7 +97,7 @@ private[spark] abstract class RpcEnv(conf: SparkConf) {
    * Retrieve the [[RpcEndpointRef]] represented by `uri`. This is a blocking action.
    */
   def setupEndpointRefByURI(uri: String): RpcEndpointRef = {
-    Await.result(asyncSetupEndpointRefByURI(uri), defaultLookupTimeout.duration)
+    defaultLookupTimeout.awaitResult(asyncSetupEndpointRefByURI(uri))
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ private[spark] abstract class RpcEnv(conf: SparkConf) {`
`97`	`97`	* Retrieve the [[RpcEndpointRef]] represented by `uri`. This is a blocking action.
`98`	`98`	`*/`
`99`	`99`	`def setupEndpointRefByURI(uri: String): RpcEndpointRef = {`
`100`		`- Await.result(asyncSetupEndpointRefByURI(uri), defaultLookupTimeout.duration)`
	`100`	`+ defaultLookupTimeout.awaitResult(asyncSetupEndpointRefByURI(uri))`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`/**`