Skip to content

[SPARK-13142] [Web UI] Problem accessing Web UI /logPage/ on Microsoft Windows #11135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

[SPARK-13142] [Web UI] Problem accessing Web UI /logPage/ on Microsoft Windows #11135

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f8611f
Prevent Windows file separator from breaking URI parsing when viewing…
Feb 5, 2016
cbae589
Prevent Windows file separator from breaking URI parsing when viewing…
Feb 5, 2016
c517ead
Merge branch 'JIRA_SPARK-13142_WindowsWebUILogFix' of https://github.…
Feb 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/main/scala/org/apache/spark/deploy/worker/ui/LogPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import org.apache.spark.util.logging.RollingFileAppender

private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with Logging {
private val worker = parent.worker
private val workDir = parent.workDir
private val workDir = new File(parent.workDir.toURI.normalize().getPath)
private val supportedLogTypes = Set("stderr", "stdout")

def renderLog(request: HttpServletRequest): String = {
Expand Down Expand Up @@ -138,7 +138,7 @@ private[ui] class LogPage(parent: WorkerWebUI) extends WebUIPage("logPage") with
}

// Verify that the normalized path of the log directory is in the working directory
val normalizedUri = new URI(logDirectory).normalize()
val normalizedUri = new File(logDirectory).toURI.normalize()
val normalizedLogDir = new File(normalizedUri.getPath)
if (!Utils.isInDirectory(workDir, normalizedLogDir)) {
return ("Error: invalid log directory " + logDirectory, 0, 0, 0)
Expand Down