[KYUUBI #5232] In SparkOperation#cleanup always calls cancelJobGroup …

…even though it's in the completed state ### _Why are the changes needed?_ Implement this issue: #5232 ### _How was this patch tested?_ - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible - [ ] Add screenshots for manual tests if appropriate - [x] [Run test](https://kyuubi.readthedocs.io/en/master/contributing/code/testing.html#running-tests) locally before make a pull request ### _Was this patch authored or co-authored using generative AI tooling?_ No Closes #5240 from XorSum/always_cancel_job_group. Closes #5232 7da16aa [bkhan] In SparkOperation#cleanup always calls cancelJobGroup even though it's in the completed state Authored-by: bkhan <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
apache · Sep 4, 2023 · 708a0be · 708a0be
1 parent 5abc262
commit 708a0be
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/SparkOperation.scala b/...k-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/SparkOperation.scala
@@ -106,8 +106,8 @@ abstract class SparkOperation(session: Session)
     if (!isTerminalState(state)) {
       setState(targetState)
       Option(getBackgroundHandle).foreach(_.cancel(true))
-      if (!spark.sparkContext.isStopped) spark.sparkContext.cancelJobGroup(statementId)
     }
+    if (!spark.sparkContext.isStopped) spark.sparkContext.cancelJobGroup(statementId)
   }
 
   protected val forceCancel =