Skip to content

SKIPME merged Apache branch-1.6 #140

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

Merged
markhamstra merged 36 commits into from
Jan 8, 2016
Merged

SKIPME merged Apache branch-1.6 #140

Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
85a8718
[SPARK-11394][SQL] Throw IllegalArgumentException for unsupported typ…
maropu Dec 29, 2015
c069ffc
[SPARK-12526][SPARKR] ifelse`, `when`, `otherwise` unable to take Col…
saurfang Dec 29, 2015
8dc6549
[SPARK-12300] [SQL] [PYSPARK] fix schema inferance on local collections
holdenk Dec 30, 2015
cd86075
[SPARK-12399] Display correct error message when accessing REST API w…
carsonwang Dec 30, 2015
4e9dd16
[SPARK-12327][SPARKR] fix code for lintr warning for commented code
felixcheung Jan 3, 2016
f7a3223
[SPARK-12562][SQL] DataFrame.write.format(text) requires the column n…
xguo27 Jan 4, 2016
cd02038
[SPARK-12486] Worker should kill the executors more forcefully if pos…
nongli Jan 4, 2016
b5a1f56
[SPARK-12470] [SQL] Fix size reduction calculation
robbinspg Jan 4, 2016
7f37c1e
[SPARK-12579][SQL] Force user-specified JDBC driver to take precedence
JoshRosen Jan 4, 2016
1005ee3
[DOC] Adjust coverage for partitionBy()
tedyu Jan 4, 2016
8ac9198
[SPARK-12589][SQL] Fix UnsafeRowParquetRecordReader to properly set t…
nongli Jan 4, 2016
6f4a224
Merge branch 'branch-1.6' of github.com:apache/spark into csd-1.6
markhamstra Jan 4, 2016
8950482
[SPARKR][DOC] minor doc update for version in migration guide
felixcheung Jan 5, 2016
d9e4438
[SPARK-12568][SQL] Add BINARY to Encoders
marmbrus Jan 5, 2016
5afa62b
[SPARK-12647][SQL] Fix o.a.s.sqlexecution.ExchangeCoordinatorSuite.de…
robbinspg Jan 5, 2016
f31d0fd
[SPARK-12617] [PYSPARK] Clean up the leak sockets of Py4J
zsxwing Jan 5, 2016
83fe5cf
[SPARK-12511] [PYSPARK] [STREAMING] Make sure PythonDStream.registerS…
zsxwing Jan 5, 2016
0afad66
[SPARK-12450][MLLIB] Un-persist broadcasted variables in KMeans
rnowling Jan 5, 2016
bf3dca2
[SPARK-12453][STREAMING] Remove explicit dependency on aws-java-sdk
BrianLondon Jan 5, 2016
c3135d0
[SPARK-12393][SPARKR] Add read.text and write.text for SparkR
yanboliang Jan 6, 2016
1756819
[SPARK-12006][ML][PYTHON] Fix GMM failure if initialModel is not None
zero323 Jan 6, 2016
d821fae
[SPARK-12617][PYSPARK] Move Py4jCallbackConnectionCleaner to Streaming
zsxwing Jan 6, 2016
8f0ead3
[SPARK-12672][STREAMING][UI] Use the uiRoot function instead of defau…
SaintBacchus Jan 6, 2016
39b0a34
Revert "[SPARK-12672][STREAMING][UI] Use the uiRoot function instead …
zsxwing Jan 6, 2016
11b901b
[SPARK-12016] [MLLIB] [PYSPARK] Wrap Word2VecModel when loading it in…
viirya Dec 14, 2015
94af69c
[SPARK-12673][UI] Add missing uri prepending for job description
jerryshao Jan 7, 2016
d061b85
[SPARK-12678][CORE] MapPartitionsRDD clearDependencies
gpoulin Jan 7, 2016
34effc4
Revert "[SPARK-12006][ML][PYTHON] Fix GMM failure if initialModel is …
yhuai Jan 7, 2016
47a58c7
[DOC] fix 'spark.memory.offHeap.enabled' default value to false
zzcclp Jan 7, 2016
13895cb
Merge branch 'branch-1.6' of github.com:apache/spark into csd-1.6
markhamstra Jan 7, 2016
69a885a
[SPARK-12006][ML][PYTHON] Fix GMM failure if initialModel is not None
zero323 Jan 7, 2016
017b73e
[SPARK-12662][SQL] Fix DataFrame.randomSplit to avoid creating overla…
sameeragarwal Jan 7, 2016
6ef8235
[SPARK-12598][CORE] bug in setMinPartitions
datafarmer Jan 7, 2016
a7c3636
[SPARK-12507][STREAMING][DOCUMENT] Expose closeFileAfterWrite and all…
zsxwing Jan 8, 2016
0d96c54
[SPARK-12591][STREAMING] Register OpenHashMapBasedStateMap for Kryo (…
zsxwing Jan 8, 2016
a77a7c5
Merge branch 'branch-1.6' of github.com:apache/spark into csd-1.6
markhamstra Jan 8, 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
Prev Previous commit
Next Next commit
[SPARK-12673][UI] Add missing uri prepending for job description 
Otherwise the url will be failed to proxy to the right one if in YARN mode. Here is the screenshot:

![screen shot 2016-01-06 at 5 28 26 pm](https://cloud.githubusercontent.com/assets/850797/12139632/bbe78ecc-b49c-11e5-8932-94e8b3622a09.png)

Author: jerryshao <[email protected]>

Closes apache#10618 from jerryshao/SPARK-12673.

(cherry picked from commit 174e72c)
Signed-off-by: Shixiong Zhu <[email protected]>
  • Loading branch information
@jerryshao @zsxwing
jerryshao authored and zsxwing committed Jan 7, 2016
commit 94af69c9be70b9d2cd95c26288e2af9599d61e5c
6 changes: 3 additions & 3 deletions core/src/main/scala/org/apache/spark/ui/jobs/AllJobsPage.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,10 @@ 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)
val detailUrl = "%s/jobs/job?id=%s".format(basePathUri, job.jobId)
<tr id={"job-" + job.jobId}>
<td sorttable_customkey={job.jobId.toString}>
{job.jobId} {job.jobGroup.map(id => s"($id)").getOrElse("")}
Expand Down