From 7be4be01da73f5d6e8c1928fd5009b7cdb273179 Mon Sep 17 00:00:00 2001 From: jerryshao Date: Wed, 6 Jan 2016 17:37:34 +0800 Subject: [PATCH 1/2] Add missing uri prepending for job description --- core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 db9912bc817e8..08a15305084b6 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 @@ -224,7 +224,8 @@ private[ui] class AllJobsPage(parent: JobsTab) extends WebUIPage("") { } val formattedDuration = duration.map(d => UIUtils.formatDuration(d)).getOrElse("Unknown") val formattedSubmissionTime = job.submissionTime.map(UIUtils.formatDate).getOrElse("Unknown") - val jobDescription = UIUtils.makeDescription(lastStageDescription, parent.basePath) + val basePathUri = UIUtils.prependBaseUri(parent.basePath) + val jobDescription = UIUtils.makeDescription(lastStageDescription, basePathUri) val detailUrl = "%s/jobs/job?id=%s".format(UIUtils.prependBaseUri(parent.basePath), job.jobId) From 9bb0fd4fd1fb4fca54779d7b57079d3c9927cf1e Mon Sep 17 00:00:00 2001 From: jerryshao Date: Thu, 7 Jan 2016 09:05:02 +0800 Subject: [PATCH 2/2] Address the comment --- core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 08a15305084b6..451cd83b51ae7 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 @@ -227,8 +227,7 @@ private[ui] class AllJobsPage(parent: JobsTab) extends WebUIPage("") { val basePathUri = UIUtils.prependBaseUri(parent.basePath) val jobDescription = UIUtils.makeDescription(lastStageDescription, basePathUri) - val detailUrl = - "%s/jobs/job?id=%s".format(UIUtils.prependBaseUri(parent.basePath), job.jobId) + val detailUrl = "%s/jobs/job?id=%s".format(basePathUri, job.jobId) {job.jobId} {job.jobGroup.map(id => s"($id)").getOrElse("")}