You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/02/11 16:56:11 UTC
spark git commit: [SPARK-5733] Error Link in Pagination of
HistroyPage when showing Incomplete Applications
Repository: spark
Updated Branches:
refs/heads/master bd0d6e0cc -> 1ac099e3e
[SPARK-5733] Error Link in Pagination of HistroyPage when showing Incomplete Applications
The links in pagination of HistroyPage is wrong when showing Incomplete Applications.
If "2" is click on the following page "http://history-server:18080/?page=1&showIncomplete=true", it will go to "http://history-server:18080/?page=2" instead of "http://history-server:18080/?page=2&showIncomplete=true".
Author: guliangliang <gu...@qiyi.com>
Closes #4523 from marsishandsome/Spark5733 and squashes the following commits:
9d7b593 [guliangliang] [SPARK-5733] Error Link in Pagination of HistroyPage when showing Incomplete Applications
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/1ac099e3
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/1ac099e3
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/1ac099e3
Branch: refs/heads/master
Commit: 1ac099e3e00ddb01af8e6e3a84c70f8363f04b5c
Parents: bd0d6e0
Author: guliangliang <gu...@qiyi.com>
Authored: Wed Feb 11 15:55:49 2015 +0000
Committer: Sean Owen <so...@cloudera.com>
Committed: Wed Feb 11 15:55:49 2015 +0000
----------------------------------------------------------------------
.../org/apache/spark/deploy/history/HistoryPage.scala | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/1ac099e3/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
----------------------------------------------------------------------
diff --git a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
index e4e7bc2..26ebc75 100644
--- a/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
+++ b/core/src/main/scala/org/apache/spark/deploy/history/HistoryPage.scala
@@ -61,9 +61,10 @@ private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {
// page, `...` will be displayed.
if (allApps.size > 0) {
val leftSideIndices =
- rangeIndices(actualPage - plusOrMinus until actualPage, 1 < _)
+ rangeIndices(actualPage - plusOrMinus until actualPage, 1 < _, requestedIncomplete)
val rightSideIndices =
- rangeIndices(actualPage + 1 to actualPage + plusOrMinus, _ < pageCount)
+ rangeIndices(actualPage + 1 to actualPage + plusOrMinus, _ < pageCount,
+ requestedIncomplete)
<h4>
Showing {actualFirst + 1}-{last + 1} of {allApps.size}
@@ -122,8 +123,10 @@ private[spark] class HistoryPage(parent: HistoryServer) extends WebUIPage("") {
"Spark User",
"Last Updated")
- private def rangeIndices(range: Seq[Int], condition: Int => Boolean): Seq[Node] = {
- range.filter(condition).map(nextPage => <a href={"/?page=" + nextPage}> {nextPage} </a>)
+ private def rangeIndices(range: Seq[Int], condition: Int => Boolean, showIncomplete: Boolean):
+ Seq[Node] = {
+ range.filter(condition).map(nextPage =>
+ <a href={makePageLink(nextPage, showIncomplete)}> {nextPage} </a>)
}
private def appRow(info: ApplicationHistoryInfo): Seq[Node] = {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org