Add some conditions

apache · Feb 27, 2015 · fa3e486 · fa3e486
1 parent 9a7be93
commit fa3e486
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala b/core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala
@@ -192,7 +192,8 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
   }
 
   private def appRow(app: ApplicationInfo, active: Boolean): Seq[Node] = {
-    val killLink = if (parent.killEnabled && app.state == ApplicationState.RUNNING) {
+    val killLink = if (parent.killEnabled &&
+      (app.state == ApplicationState.RUNNING || app.state == ApplicationState.WAITING)) {
     val killLinkUri = s"app/kill?id=${app.id}&terminate=true"
     val confirm = "return window.confirm(" +
       s"'Are you sure you want to kill application ${app.id} ?');"
@@ -238,7 +239,10 @@ private[spark] class MasterPage(parent: MasterWebUI) extends WebUIPage("") {
   }
 
   private def driverRow(driver: DriverInfo): Seq[Node] = {
-    val killLink = if (parent.killEnabled && driver.state == DriverState.RUNNING) {
+    val killLink = if (parent.killEnabled &&
+      (driver.state == DriverState.RUNNING ||
+        driver.state == DriverState.SUBMITTED ||
+        driver.state == DriverState.RELAUNCHING)) {
     val killLinkUri = s"driver/kill?id=${driver.id}&terminate=true"
     val confirm = "return window.confirm(" +
       s"'Are you sure you want to kill driver ${driver.id} ?');"