git commit: SPARK-1202: Improvements to task killing in the UI.
Repository: spark
Updated Branches:
refs/heads/master 7b4203ab4 - 44f654eec
SPARK-1202: Improvements to task killing in the UI.
1. Adds a separate endpoint for the killing logic that is outside of a page.
2. Narrows the scope of the killingEnabled tracking.
3. Some style improvements.
Author: Patrick Wendell pwend...@gmail.com
Closes #386 from pwendell/kill-link and squashes the following commits:
8efe02b [Patrick Wendell] Improvements to task killing in the UI.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/44f654ee
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/44f654ee
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/44f654ee
Branch: refs/heads/master
Commit: 44f654eecd3c181f2aeaff3871acf7f00eacc6b9
Parents: 7b4203a
Author: Patrick Wendell pwend...@gmail.com
Authored: Thu Apr 10 20:43:56 2014 -0700
Committer: Patrick Wendell pwend...@gmail.com
Committed: Thu Apr 10 20:43:56 2014 -0700
--
.../resources/org/apache/spark/ui/static/webui.css | 9 +
.../scala/org/apache/spark/ui/JettyUtils.scala | 2 ++
.../main/scala/org/apache/spark/ui/SparkUI.scala | 5 ++---
.../scala/org/apache/spark/ui/jobs/IndexPage.scala | 11 ---
.../org/apache/spark/ui/jobs/JobProgressUI.scala | 17 -
.../org/apache/spark/ui/jobs/StageTable.scala | 16 +---
6 files changed, 38 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/44f654ee/core/src/main/resources/org/apache/spark/ui/static/webui.css
--
diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.css
b/core/src/main/resources/org/apache/spark/ui/static/webui.css
index fe54c34..599c3ac 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/webui.css
+++ b/core/src/main/resources/org/apache/spark/ui/static/webui.css
@@ -78,3 +78,12 @@ table.sortable thead {
background-repeat: repeat-x;
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#FFA4EDFF',
endColorstr='#FF94DDFF', GradientType=0);
}
+
+span.kill-link {
+ margin-right: 2px;
+ color: gray;
+}
+
+span.kill-link a {
+ color: gray;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/44f654ee/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
--
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
index 9ce0398..dd0818e 100644
--- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -104,10 +104,12 @@ private[spark] object JettyUtils extends Logging {
def createRedirectHandler(
srcPath: String,
destPath: String,
+ beforeRedirect: HttpServletRequest = Unit = x = (),
basePath: String = ): ServletContextHandler = {
val prefixedDestPath = attachPrefix(basePath, destPath)
val servlet = new HttpServlet {
override def doGet(request: HttpServletRequest, response:
HttpServletResponse) {
+beforeRedirect(request)
// Make sure we don't end up with // in the middle
val newUrl = new URL(new URL(request.getRequestURL.toString),
prefixedDestPath).toString
response.sendRedirect(newUrl)
http://git-wip-us.apache.org/repos/asf/spark/blob/44f654ee/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
--
diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
index dac11ec..4c891d7 100644
--- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
@@ -32,7 +32,7 @@ import org.apache.spark.util.Utils
/** Top level user interface for Spark */
private[spark] class SparkUI(
val sc: SparkContext,
-conf: SparkConf,
+val conf: SparkConf,
val listenerBus: SparkListenerBus,
var appName: String,
val basePath: String = )
@@ -46,7 +46,6 @@ private[spark] class SparkUI(
val live = sc != null
val securityManager = if (live) sc.env.securityManager else new
SecurityManager(conf)
- val killEnabled = conf.getBoolean(spark.ui.killEnabled, true)
private val localHost = Utils.localHostName()
private val publicHost =
Option(System.getenv(SPARK_PUBLIC_DNS)).getOrElse(localHost)
@@ -70,7 +69,7 @@ private[spark] class SparkUI(
metricsServletHandlers ++
Seq[ServletContextHandler] (
createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, /static),
- createRedirectHandler(/, /stages, basePath)
+ createRedirectHandler(/, /stages, basePath = basePath)
)
}
git commit: SPARK-1202: Improvements to task killing in the UI.
Repository: spark
Updated Branches:
refs/heads/branch-1.0 59de39b2e - a1bb4c695
SPARK-1202: Improvements to task killing in the UI.
1. Adds a separate endpoint for the killing logic that is outside of a page.
2. Narrows the scope of the killingEnabled tracking.
3. Some style improvements.
Author: Patrick Wendell pwend...@gmail.com
Closes #386 from pwendell/kill-link and squashes the following commits:
8efe02b [Patrick Wendell] Improvements to task killing in the UI.
(cherry picked from commit 44f654eecd3c181f2aeaff3871acf7f00eacc6b9)
Signed-off-by: Patrick Wendell pwend...@gmail.com
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/a1bb4c69
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/a1bb4c69
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/a1bb4c69
Branch: refs/heads/branch-1.0
Commit: a1bb4c695872ce512f18ec4a91fd430abc850ae9
Parents: 59de39b
Author: Patrick Wendell pwend...@gmail.com
Authored: Thu Apr 10 20:43:56 2014 -0700
Committer: Patrick Wendell pwend...@gmail.com
Committed: Thu Apr 10 20:44:18 2014 -0700
--
.../resources/org/apache/spark/ui/static/webui.css | 9 +
.../scala/org/apache/spark/ui/JettyUtils.scala | 2 ++
.../main/scala/org/apache/spark/ui/SparkUI.scala | 5 ++---
.../scala/org/apache/spark/ui/jobs/IndexPage.scala | 11 ---
.../org/apache/spark/ui/jobs/JobProgressUI.scala | 17 -
.../org/apache/spark/ui/jobs/StageTable.scala | 16 +---
6 files changed, 38 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/spark/blob/a1bb4c69/core/src/main/resources/org/apache/spark/ui/static/webui.css
--
diff --git a/core/src/main/resources/org/apache/spark/ui/static/webui.css
b/core/src/main/resources/org/apache/spark/ui/static/webui.css
index fe54c34..599c3ac 100644
--- a/core/src/main/resources/org/apache/spark/ui/static/webui.css
+++ b/core/src/main/resources/org/apache/spark/ui/static/webui.css
@@ -78,3 +78,12 @@ table.sortable thead {
background-repeat: repeat-x;
filter:
progid:dximagetransform.microsoft.gradient(startColorstr='#FFA4EDFF',
endColorstr='#FF94DDFF', GradientType=0);
}
+
+span.kill-link {
+ margin-right: 2px;
+ color: gray;
+}
+
+span.kill-link a {
+ color: gray;
+}
http://git-wip-us.apache.org/repos/asf/spark/blob/a1bb4c69/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
--
diff --git a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
index 9ce0398..dd0818e 100644
--- a/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
+++ b/core/src/main/scala/org/apache/spark/ui/JettyUtils.scala
@@ -104,10 +104,12 @@ private[spark] object JettyUtils extends Logging {
def createRedirectHandler(
srcPath: String,
destPath: String,
+ beforeRedirect: HttpServletRequest = Unit = x = (),
basePath: String = ): ServletContextHandler = {
val prefixedDestPath = attachPrefix(basePath, destPath)
val servlet = new HttpServlet {
override def doGet(request: HttpServletRequest, response:
HttpServletResponse) {
+beforeRedirect(request)
// Make sure we don't end up with // in the middle
val newUrl = new URL(new URL(request.getRequestURL.toString),
prefixedDestPath).toString
response.sendRedirect(newUrl)
http://git-wip-us.apache.org/repos/asf/spark/blob/a1bb4c69/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
--
diff --git a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
index dac11ec..4c891d7 100644
--- a/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
+++ b/core/src/main/scala/org/apache/spark/ui/SparkUI.scala
@@ -32,7 +32,7 @@ import org.apache.spark.util.Utils
/** Top level user interface for Spark */
private[spark] class SparkUI(
val sc: SparkContext,
-conf: SparkConf,
+val conf: SparkConf,
val listenerBus: SparkListenerBus,
var appName: String,
val basePath: String = )
@@ -46,7 +46,6 @@ private[spark] class SparkUI(
val live = sc != null
val securityManager = if (live) sc.env.securityManager else new
SecurityManager(conf)
- val killEnabled = conf.getBoolean(spark.ui.killEnabled, true)
private val localHost = Utils.localHostName()
private val publicHost =
Option(System.getenv(SPARK_PUBLIC_DNS)).getOrElse(localHost)
@@ -70,7 +69,7 @@ private[spark] class SparkUI(
metricsServletHandlers ++
Seq[ServletContextHandler] (
createStaticHandler(SparkUI.STATIC_RESOURCE_DIR, /static),
-
