This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch branch-3.5
in repository https://gitbox.apache.org/repos/asf/spark.git


The following commit(s) were added to refs/heads/branch-3.5 by this push:
     new ac031d68a01 [SPARK-46369][CORE] Remove `kill` link from `RELAUNCHING` 
drivers in `MasterPage`
ac031d68a01 is described below

commit ac031d68a01f14cc73f05e83a790a6787aa6453d
Author: Dongjoon Hyun <dh...@apple.com>
AuthorDate: Mon Dec 11 15:05:21 2023 -0800

    [SPARK-46369][CORE] Remove `kill` link from `RELAUNCHING` drivers in 
`MasterPage`
    
    ### What changes were proposed in this pull request?
    
    This PR aims to remove `kill` hyperlink from `RELAUNCHING` drivers in 
`MasterPage`.
    
    ### Why are the changes needed?
    
    Since Apache Spark 1.4.0 (SPARK-5495), `RELAUNCHING` drivers have `kill` 
hyperlinks in the `Completed Drivers` table.
    
    ![Screenshot 2023-12-11 at 1 02 29 
PM](https://github.com/apache/spark/assets/9700541/38f4bf08-efb9-47e5-8a7a-f7d127429012)
    
    However, this is a bug because the driver was already terminated by 
definition. Newly relaunched driver has an independent ID and there is no 
relationship with the previously terminated ID.
    
    
https://github.com/apache/spark/blob/7db85642600b1e3b39ca11e41d4e3e0bf1c8962b/core/src/main/scala/org/apache/spark/deploy/master/DriverState.scala#L27
    
    If we clicked the `kill` link, `Master` always complains like the following.
    ```
    23/12/11 21:25:50 INFO Master: Asked to kill driver 202312112113-00000
    23/12/11 21:25:50 WARN Master: Driver 202312112113-00000 has already 
finished or does not exist
    ```
    
    ### Does this PR introduce _any_ user-facing change?
    
    No.
    
    ### How was this patch tested?
    
    Manual review.
    
    ### Was this patch authored or co-authored using generative AI tooling?
    
    No.
    
    Closes #44301 from dongjoon-hyun/SPARK-46369.
    
    Authored-by: Dongjoon Hyun <dh...@apple.com>
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
    (cherry picked from commit e434c9f0d5792b7af43c87dd6145fd8a6a04d8e2)
    Signed-off-by: Dongjoon Hyun <dh...@apple.com>
---
 core/src/main/scala/org/apache/spark/deploy/master/ui/MasterPage.scala | 3 +--
 1 file changed, 1 insertion(+), 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
index a71eb33a2fe..e7e90aa0a37 100644
--- 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
@@ -322,8 +322,7 @@ private[ui] class MasterPage(parent: MasterWebUI) extends 
WebUIPage("") {
   private def driverRow(driver: DriverInfo, showDuration: Boolean): Seq[Node] 
= {
     val killLink = if (parent.killEnabled &&
       (driver.state == DriverState.RUNNING ||
-        driver.state == DriverState.SUBMITTED ||
-        driver.state == DriverState.RELAUNCHING)) {
+        driver.state == DriverState.SUBMITTED)) {
       val confirm =
         s"if (window.confirm('Are you sure you want to kill driver 
${driver.id} ?')) " +
           "{ this.parentNode.submit(); return true; } else { return false; }"


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org

Reply via email to