diff options
| author | Ali Ghodsi <alig@cs.berkeley.edu> | 2013-09-02 19:04:08 -0700 |
|---|---|---|
| committer | Ali Ghodsi <alig@cs.berkeley.edu> | 2013-09-02 19:04:08 -0700 |
| commit | e452bd6d77bf1824a128599de2c3ec3663808ab6 (patch) | |
| tree | 7d8bd06a11654bbfc988fd44972decc0161a1873 /core/src | |
| parent | cf7b115496d6847100fee82ce5a1435b52109538 (diff) | |
| download | spark-e452bd6d77bf1824a128599de2c3ec3663808ab6.tar.gz spark-e452bd6d77bf1824a128599de2c3ec3663808ab6.tar.bz2 spark-e452bd6d77bf1824a128599de2c3ec3663808ab6.zip | |
Brushing the code up slightly
Diffstat (limited to 'core/src')
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/deploy/master/Master.scala | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala b/core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala index 14a453699d..b8856e6e00 100644 --- a/core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala +++ b/core/src/main/scala/org/apache/spark/deploy/DeployMessage.scala @@ -129,6 +129,6 @@ private[deploy] object DeployMessages { case object RequestWebUIPort - case class WebUIPortResponse(boundedPort: Int) {} + case class WebUIPortResponse(webUIBoundPort: Int) {} } diff --git a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala index 50d5900ecd..dd7dcae619 100644 --- a/core/src/main/scala/org/apache/spark/deploy/master/Master.scala +++ b/core/src/main/scala/org/apache/spark/deploy/master/Master.scala @@ -389,9 +389,9 @@ private[spark] object Master { def startSystemAndActor(host: String, port: Int, webUiPort: Int): (ActorSystem, Int, Int) = { val (actorSystem, boundPort) = AkkaUtils.createActorSystem(systemName, host, port) val actor = actorSystem.actorOf(Props(new Master(host, boundPort, webUiPort)), name = actorName) - implicit val timeout = Timeout(1 seconds) - val respFuture = actor ? RequestWebUIPort + implicit val timeout = Timeout(5 seconds) + val respFuture = actor ? RequestWebUIPort // ask pattern val resp = Await.result(respFuture, timeout.duration).asInstanceOf[WebUIPortResponse] - (actorSystem, boundPort, resp.boundedPort) + (actorSystem, boundPort, resp.webUIBoundPort) } } |