RESTful API supports killing engine forcibly

docs/client/rest/rest_api.md

@@ -457,13 +457,14 @@ Delete the specified engine.
 
 #### Request Parameters
 
-| Name                    | Description                   | Type             |
-|:------------------------|:------------------------------|:-----------------|
-| type                    | the engine type               | String(optional) |
-| sharelevel              | the engine share level        | String(optional) |
-| subdomain               | the engine subdomain          | String(optional) |
-| proxyUser               | the proxy user to impersonate | String(optional) |
-| hive.server2.proxy.user | the proxy user to impersonate | String(optional) |
+| Name                    | Description                         | Type              |
+|:------------------------|:------------------------------------|:------------------|
+| type                    | the engine type                     | String(optional)  |
+| sharelevel              | the engine share level              | String(optional)  |
+| subdomain               | the engine subdomain                | String(optional)  |
+| proxyUser               | the proxy user to impersonate       | String(optional)  |
+| hive.server2.proxy.user | the proxy user to impersonate       | String(optional)  |
+| kill                    | whether to kill the engine forcibly | Boolean(optional) |
 
 `proxyUser` is an alternative to `hive.server2.proxy.user`, and the current behavior is consistent with
 `hive.server2.proxy.user`. When both parameters are set, `proxyUser` takes precedence.

kyuubi-common/src/main/scala/org/apache/kyuubi/config/KyuubiConf.scala

@@ -3546,10 +3546,7 @@ object KyuubiConf {
       .toSequence()
       .createWithDefault(Seq(
         "spark.driver.memory",
-        "spark.executor.memory",
-        "spark.kubernetes.context",
-        "spark.kubernetes.namespace",
-        "spark.master"))
+        "spark.executor.memory"))
 
   val ENGINE_SPARK_INITIALIZE_SQL: ConfigEntry[Seq[String]] =
     buildConf("kyuubi.engine.spark.initialize.sql")

kyuubi-server/src/main/scala/org/apache/kyuubi/server/api/v1/AdminResource.scala

@@ -279,7 +279,7 @@ private[v1] class AdminResource extends ApiRequestContext with Logging {
       @QueryParam("subdomain") subdomain: String,
       @QueryParam("proxyUser") kyuubiProxyUser: String,
       @QueryParam("hive.server2.proxy.user") hs2ProxyUser: String,
-      @QueryParam("forceKill") @DefaultValue("false") forceKill: Boolean): Response = {
+      @QueryParam("kill") @DefaultValue("false") kill: Boolean): Response = {
     val activeProxyUser = Option(kyuubiProxyUser).getOrElse(hs2ProxyUser)
     val userName = if (fe.isAdministrator(fe.getRealUser())) {
       Option(activeProxyUser).getOrElse(fe.getRealUser())
@@ -307,7 +307,7 @@ private[v1] class AdminResource extends ApiRequestContext with Logging {
               s"${e.getMessage}")
         }
 
-        if (forceKill && engineRefId != null) {
+        if (kill && engineRefId != null) {
           val appMgrInfo =
             engineNode.attributes.get(KyuubiReservedKeys.KYUUBI_ENGINE_APP_MGR_INFO)
               .map(ApplicationManagerInfo.deserialize).getOrElse(ApplicationManagerInfo(None))

kyuubi-server/src/test/scala/org/apache/kyuubi/server/api/v1/AdminResourceSuite.scala

@@ -331,7 +331,7 @@ class AdminResourceSuite extends KyuubiFunSuite with RestFrontendTestHelper {
       val response = webTarget.path("api/v1/admin/engine")
         .queryParam("sharelevel", "USER")
         .queryParam("type", "spark_sql")
-        .queryParam("forceKill", "true")
+        .queryParam("kill", "true")
         .request(MediaType.APPLICATION_JSON_TYPE)
         .header(AUTHORIZATION_HEADER, HttpAuthUtils.basicAuthorizationHeader(Utils.currentUser))
         .delete()