Repository: spark
Updated Branches:
refs/heads/master 893ea224c -> c5aa54d54
[SPARK-24553][WEB-UI] http 302 fixes for href redirect
## What changes were proposed in this pull request?
Updated URL/href links to include a '/' before '?id' to make links consistent
and avoid http 302 redirect errors within UI port 4040 tabs.
## How was this patch tested?
Built a runnable distribution and executed jobs. Validated that http 302
redirects are no longer encountered when clicking on links within UI port 4040
tabs.
Author: Steven Kallman <SJKallmangmail.com>
Author: Kallman, Steven <steven.kall...@capitalone.com>
Closes #21600 from SJKallman/{Spark-24553}{WEB-UI}-redirect-href-fixes.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/c5aa54d5
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/c5aa54d5
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/c5aa54d5
Branch: refs/heads/master
Commit: c5aa54d54b301555bad1ff0653df11293f0033ed
Parents: 893ea22
Author: Kallman, Steven <steven.kall...@capitalone.com>
Authored: Wed Jun 27 15:36:59 2018 -0700
Committer: Xiao Li <gatorsm...@gmail.com>
Committed: Wed Jun 27 15:36:59 2018 -0700
----------------------------------------------------------------------
core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala | 2 +-
core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala | 2 +-
core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala | 2 +-
.../org/apache/spark/sql/execution/ui/AllExecutionsPage.scala | 4 ++--
.../scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala | 2 +-
.../apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala | 4 ++--
.../spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala | 2 +-
.../src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala | 2 +-
8 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
index 178d2c8..90e9a7a 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
@@ -464,7 +464,7 @@ private[ui] class JobDataSource(
val jobDescription = UIUtils.makeDescription(lastStageDescription,
basePath, plainText = false)
- val detailUrl = "%s/jobs/job?id=%s".format(basePath, jobData.jobId)
+ val detailUrl = "%s/jobs/job/?id=%s".format(basePath, jobData.jobId)
new JobTableRowData(
jobData,
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
index d4e6a7b..55eb989 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StagePage.scala
@@ -282,7 +282,7 @@ private[ui] class StagePage(parent: StagesTab, store:
AppStatusStore) extends We
val _taskTable = new TaskPagedTable(
stageData,
UIUtils.prependBaseUri(request, parent.basePath) +
- s"/stages/stage?id=${stageId}&attempt=${stageAttemptId}",
+ s"/stages/stage/?id=${stageId}&attempt=${stageAttemptId}",
currentTime,
pageSize = taskPageSize,
sortColumn = taskSortColumn,
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
index 56e4d68..d01acda 100644
--- a/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
+++ b/core/src/main/scala/org/apache/spark/ui/jobs/StageTable.scala
@@ -370,7 +370,7 @@ private[ui] class StagePagedTable(
Seq.empty
}
- val nameLinkUri =
s"$basePathUri/stages/stage?id=${s.stageId}&attempt=${s.attemptId}"
+ val nameLinkUri =
s"$basePathUri/stages/stage/?id=${s.stageId}&attempt=${s.attemptId}"
val nameLink = <a href={nameLinkUri} class="name-link">{s.name}</a>
val cachedRddInfos = store.rddList().filter { rdd =>
s.rddIds.contains(rdd.id) }
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
index bf46bc4..a7a24ac 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/AllExecutionsPage.scala
@@ -214,11 +214,11 @@ private[ui] abstract class ExecutionTable(
}
private def jobURL(request: HttpServletRequest, jobId: Long): String =
- "%s/jobs/job?id=%s".format(UIUtils.prependBaseUri(request,
parent.basePath), jobId)
+ "%s/jobs/job/?id=%s".format(UIUtils.prependBaseUri(request,
parent.basePath), jobId)
private def executionURL(request: HttpServletRequest, executionID: Long):
String =
s"${UIUtils.prependBaseUri(
- request, parent.basePath)}/${parent.prefix}/execution?id=$executionID"
+ request, parent.basePath)}/${parent.prefix}/execution/?id=$executionID"
}
private[ui] class RunningExecutionTable(
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
----------------------------------------------------------------------
diff --git
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
index 282f7b4..877176b 100644
---
a/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
+++
b/sql/core/src/main/scala/org/apache/spark/sql/execution/ui/ExecutionPage.scala
@@ -122,7 +122,7 @@ class ExecutionPage(parent: SQLTab) extends
WebUIPage("execution") with Logging
}
private def jobURL(request: HttpServletRequest, jobId: Long): String =
- "%s/jobs/job?id=%s".format(UIUtils.prependBaseUri(request,
parent.basePath), jobId)
+ "%s/jobs/job/?id=%s".format(UIUtils.prependBaseUri(request,
parent.basePath), jobId)
private def physicalPlanDescription(physicalPlanDescription: String):
Seq[Node] = {
<div>
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
----------------------------------------------------------------------
diff --git
a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
index 0950b30..771104c 100644
---
a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
+++
b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerPage.scala
@@ -76,7 +76,7 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab)
extends WebUIPage(""
def generateDataRow(info: ExecutionInfo): Seq[Node] = {
val jobLink = info.jobId.map { id: String =>
- <a href={"%s/jobs/job?id=%s".format(
+ <a href={"%s/jobs/job/?id=%s".format(
UIUtils.prependBaseUri(request, parent.basePath), id)}>
[{id}]
</a>
@@ -147,7 +147,7 @@ private[ui] class ThriftServerPage(parent: ThriftServerTab)
extends WebUIPage(""
val headerRow = Seq("User", "IP", "Session ID", "Start Time", "Finish
Time", "Duration",
"Total Execute")
def generateDataRow(session: SessionInfo): Seq[Node] = {
- val sessionLink = "%s/%s/session?id=%s".format(
+ val sessionLink = "%s/%s/session/?id=%s".format(
UIUtils.prependBaseUri(request, parent.basePath), parent.prefix,
session.sessionId)
<tr>
<td> {session.userName} </td>
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
----------------------------------------------------------------------
diff --git
a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
index c884aa0..163eb43 100644
---
a/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
+++
b/sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/ui/ThriftServerSessionPage.scala
@@ -86,7 +86,7 @@ private[ui] class ThriftServerSessionPage(parent:
ThriftServerTab)
def generateDataRow(info: ExecutionInfo): Seq[Node] = {
val jobLink = info.jobId.map { id: String =>
- <a href={"%s/jobs/job?id=%s".format(
+ <a href={"%s/jobs/job/?id=%s".format(
UIUtils.prependBaseUri(request, parent.basePath), id)}>
[{id}]
</a>
http://git-wip-us.apache.org/repos/asf/spark/blob/c5aa54d5/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala
----------------------------------------------------------------------
diff --git
a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala
b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala
index ca9da61..884d21d 100644
--- a/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala
+++ b/streaming/src/main/scala/org/apache/spark/streaming/ui/BatchPage.scala
@@ -109,7 +109,7 @@ private[ui] class BatchPage(parent: StreamingTab) extends
WebUIPage("batch") {
flatMap(info => info.failureReason).headOption.getOrElse("")
val formattedDuration = duration.map(d =>
SparkUIUtils.formatDuration(d)).getOrElse("-")
val detailUrl = s"${SparkUIUtils.prependBaseUri(
- request, parent.basePath)}/jobs/job?id=${sparkJob.jobId}"
+ request, parent.basePath)}/jobs/job/?id=${sparkJob.jobId}"
// In the first row, output op id and its information needs to be shown.
In other rows, these
// cells will be taken up due to "rowspan".
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
