[SPARK-6980] Using RpcTimeout.awaitResult for future in AppClient now

markhamstra · May 16, 2015 · 78a2c0a · 78a2c0a
1 parent 97523e0
commit 78a2c0a
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala b/core/src/main/scala/org/apache/spark/deploy/client/AppClient.scala
@@ -195,8 +195,7 @@ private[spark] class AppClient(
       try {
         val timeout = RpcUtils.askTimeout(conf)
         val future = actor.ask(StopAppClient)(timeout.duration)
-        // TODO(bryanc) - RpcTimeout use awaitResult ???
-        Await.result(future, timeout.duration)
+        timeout.awaitResult(future)
       } catch {
         case e: TimeoutException =>
           logInfo("Stop request to Master timed out; it may already be shut down.")