diff options
| author | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-29 22:16:22 -0700 |
|---|---|---|
| committer | Matei Zaharia <matei@eecs.berkeley.edu> | 2013-03-29 22:16:22 -0700 |
| commit | 9831bc1a09fa7fd56f55c3df4f448bc37b3d7d9a (patch) | |
| tree | dd91594f213979ac5b2db8dccf72505d39128439 | |
| parent | 3cc8ab6e298b2dcdd236a38ab3d43aa617285a35 (diff) | |
| parent | 445f387ef4213b5b63f28cbc011236c2aba1d1c9 (diff) | |
| download | spark-9831bc1a09fa7fd56f55c3df4f448bc37b3d7d9a.tar.gz spark-9831bc1a09fa7fd56f55c3df4f448bc37b3d7d9a.tar.bz2 spark-9831bc1a09fa7fd56f55c3df4f448bc37b3d7d9a.zip | |
Merge pull request #539 from cgrothaus/fix-webui-workdirpath
Bugfix: WorkerWebUI must respect workDirPath from Worker
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/Worker.scala | 2 | ||||
| -rw-r--r-- | core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/src/main/scala/spark/deploy/worker/Worker.scala b/core/src/main/scala/spark/deploy/worker/Worker.scala index da3f4f636c..8919d1261c 100644 --- a/core/src/main/scala/spark/deploy/worker/Worker.scala +++ b/core/src/main/scala/spark/deploy/worker/Worker.scala @@ -81,7 +81,7 @@ private[spark] class Worker( } def startWebUi() { - val webUi = new WorkerWebUI(context.system, self) + val webUi = new WorkerWebUI(context.system, self, workDir) try { AkkaUtils.startSprayServer(context.system, "0.0.0.0", webUiPort, webUi.handler) } catch { diff --git a/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala b/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala index 135cc2e86c..c834f87d50 100644 --- a/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala +++ b/core/src/main/scala/spark/deploy/worker/WorkerWebUI.scala @@ -12,12 +12,13 @@ import cc.spray.typeconversion.SprayJsonSupport._ import spark.deploy.{WorkerState, RequestWorkerState} import spark.deploy.JsonProtocol._ +import java.io.File /** * Web UI server for the standalone worker. */ private[spark] -class WorkerWebUI(val actorSystem: ActorSystem, worker: ActorRef) extends Directives { +class WorkerWebUI(val actorSystem: ActorSystem, worker: ActorRef, workDir: File) extends Directives { val RESOURCE_DIR = "spark/deploy/worker/webui" val STATIC_RESOURCE_DIR = "spark/deploy/static" @@ -43,7 +44,7 @@ class WorkerWebUI(val actorSystem: ActorSystem, worker: ActorRef) extends Direct path("log") { parameters("appId", "executorId", "logType") { (appId, executorId, logType) => respondWithMediaType(cc.spray.http.MediaTypes.`text/plain`) { - getFromFileName("work/" + appId + "/" + executorId + "/" + logType) + getFromFileName(workDir.getPath() + "/" + appId + "/" + executorId + "/" + logType) } } } ~ |