diff options
| author | Denny <dennybritz@gmail.com> | 2012-08-02 13:55:09 -0700 |
|---|---|---|
| committer | Denny <dennybritz@gmail.com> | 2012-08-02 13:55:09 -0700 |
| commit | ba7e30fb5ee31ab3f99dcb95148f0c95bf3f45b4 (patch) | |
| tree | 38be5f504ecc98f04894e1303ab6885613c765c5 /core | |
| parent | 863c31b7c16727626a09fe7d2912191e7585a6dc (diff) | |
| download | spark-ba7e30fb5ee31ab3f99dcb95148f0c95bf3f45b4.tar.gz spark-ba7e30fb5ee31ab3f99dcb95148f0c95bf3f45b4.tar.bz2 spark-ba7e30fb5ee31ab3f99dcb95148f0c95bf3f45b4.zip | |
Mostly stlyistic changes.
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/main/scala/spark/deploy/DeployMessage.scala | 7 | ||||
| -rw-r--r-- | core/src/main/scala/spark/deploy/master/MasterWebUI.scala | 5 | ||||
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/Worker.scala | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/core/src/main/scala/spark/deploy/DeployMessage.scala b/core/src/main/scala/spark/deploy/DeployMessage.scala index b764475c12..141bbe4d57 100644 --- a/core/src/main/scala/spark/deploy/DeployMessage.scala +++ b/core/src/main/scala/spark/deploy/DeployMessage.scala @@ -57,11 +57,14 @@ case object RequestMasterState // Master to MasterWebUI -case class MasterState(uri : String, workers: List[WorkerInfo], activeJobs: List[JobInfo], completedJobs: List[JobInfo]) +case class MasterState(uri : String, workers: List[WorkerInfo], activeJobs: List[JobInfo], + completedJobs: List[JobInfo]) // WorkerWebUI to Worker case object RequestWorkerState // Worker to WorkerWebUI -case class WorkerState(uri: String, workerId: String, executors: List[ExecutorRunner], finishedExecutors: List[ExecutorRunner], masterUrl: String, cores: Int, memory: Int, coresUsed: Int, memoryUsed: Int, masterWebUiUrl: String)
\ No newline at end of file +case class WorkerState(uri: String, workerId: String, executors: List[ExecutorRunner], + finishedExecutors: List[ExecutorRunner], masterUrl: String, cores: Int, memory: Int, + coresUsed: Int, memoryUsed: Int, masterWebUiUrl: String)
\ No newline at end of file diff --git a/core/src/main/scala/spark/deploy/master/MasterWebUI.scala b/core/src/main/scala/spark/deploy/master/MasterWebUI.scala index 0dce4c4abd..cb94174bcc 100644 --- a/core/src/main/scala/spark/deploy/master/MasterWebUI.scala +++ b/core/src/main/scala/spark/deploy/master/MasterWebUI.scala @@ -26,8 +26,9 @@ class MasterWebUI(val actorSystem: ActorSystem, master: ActorRef) extends Direct path("job") { parameter("jobId") { jobId => completeWith { - val masterState = getMasterState - // A bit ugly an inefficient, but we won't have a number of jobs so large that it will make a significant difference. + val masterState = getMasterState() + // A bit ugly an inefficient, but we won't have a number of jobs + // so large that it will make a significant difference. (masterState.activeJobs ::: masterState.completedJobs).find(_.id == jobId) match { case Some(job) => masterui.html.job_details.render(job) case _ => null diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala index ffe6bb8cb4..8647f118ee 100644 --- a/core/src/main/scala/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/spark/deploy/worker/Worker.scala @@ -136,7 +136,9 @@ class Worker(ip: String, port: Int, webUiPort: Int, cores: Int, memory: Int, mas masterDisconnected() case RequestWorkerState => { - sender ! WorkerState(ip + ":" + port, workerId, executors.values.toList, finishedExecutors.values.toList, masterUrl, cores, memory, coresUsed, memoryUsed, masterWebUiUrl) + sender ! WorkerState(ip + ":" + port, workerId, executors.values.toList, + finishedExecutors.values.toList, masterUrl, cores, memory, + coresUsed, memoryUsed, masterWebUiUrl) } } |