update

Author: wuziyi

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

@@ -2390,12 +2390,12 @@ object KyuubiConf {
       .booleanConf
       .createWithDefault(true)
 
-  val ENGINE_EXTERNAL_ENABLED: ConfigEntry[Boolean] =
+  val ENGINE_EXTERNAL_TOKEN_ENABLED: ConfigEntry[Boolean] =
     buildConf("kyuubi.engine.external.token.enabled")
-      .doc("start kerberos-enabled application with external delegation tokens")
-      .version("1.9.0")
+      .doc("Whether to start Kerberized engine with external delegation tokens.")
+      .version("1.11.0")
       .booleanConf
-      .createWithDefault(true)
+      .createWithDefault(false)
 
   val ENGINE_SHARE_LEVEL: ConfigEntry[String] = buildConf("kyuubi.engine.share.level")
     .doc("Engines will be shared in different levels, available configs are: <ul>" +

kyuubi-server/src/main/scala/org/apache/kyuubi/credentials/YarnRMDelegationTokenProvider.scala

@@ -28,6 +28,7 @@ import org.apache.hadoop.yarn.util.ConverterUtils
 
 import org.apache.kyuubi.Logging
 import org.apache.kyuubi.config.KyuubiConf
+import org.apache.kyuubi.config.KyuubiConf.ENGINE_EXTERNAL_TOKEN_ENABLED
 import org.apache.kyuubi.credentials.HadoopFsDelegationTokenProvider.doAsProxyUser
 
 class YarnRMDelegationTokenProvider extends HadoopDelegationTokenProvider with Logging {
@@ -43,7 +44,7 @@ class YarnRMDelegationTokenProvider extends HadoopDelegationTokenProvider with L
     if (SecurityUtil.getAuthenticationMethod(hadoopConf) != AuthenticationMethod.SIMPLE) {
       yarnConf = new YarnConfiguration(hadoopConf)
       tokenService = ClientRMProxy.getRMDelegationTokenService(yarnConf)
-      required = true
+      required = kyuubiConf.get(ENGINE_EXTERNAL_TOKEN_ENABLED)
     }
   }
 

kyuubi-server/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala

@@ -61,7 +61,7 @@ class SparkProcessBuilder(
   import SparkProcessBuilder._
 
   private[kyuubi] val sparkHome = getEngineHome(shortName)
-  private[kyuubi] val externalTokensEnabled = conf.get(ENGINE_EXTERNAL_ENABLED)
+  private[kyuubi] val externalTokensEnabled = conf.get(ENGINE_EXTERNAL_TOKEN_ENABLED)
 
   override protected val executable: String = {
     Paths.get(sparkHome, "bin", SPARK_SUBMIT_FILE).toFile.getCanonicalPath

kyuubi-server/src/test/scala/org/apache/kyuubi/credentials/YarnDelegationTokenProviderSuite.scala

@@ -34,6 +34,7 @@ class YarnDelegationTokenProviderSuite extends WithSecuredYarnCluster {
 
       val hadoopConf = getHadoopConf
       val kyuubiConf = new KyuubiConf(false)
+      kyuubiConf.set("kyuubi.engine.external.token.enabled", "true")
 
       val provider = new YarnRMDelegationTokenProvider
       provider.initialize(hadoopConf, kyuubiConf)

kyuubi-server/src/test/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilderSuite.scala

@@ -488,32 +488,11 @@ class SparkProcessBuilderSuite extends KerberizedTestHelper with MockitoSugar {
 
   test("spark engine with external token file") {
     val conf1 = KyuubiConf(false)
-    val tokenStr = "SERUUwAID2hhLWhkZnM6cmVkcG9sbD8ABmhhZG9vcAAfaGl2ZS9oaXZl" +
-      "c2VydmVyQE5JRS5ORVRFQVNFLkNPTYoBmEC/zomKAZhkzFKJjEQmld6OB4YUpNYg2W5h9" +
-      "+2R2gWTPCf0Ut/Qr9QVSERGU19ERUxFR0FUSU9OX1RPS0VOD2hhLWhkZnM6cmVkcG9sbB" +
-      "FoYS1oZGZzOmZlbmdodWFuZz8ABmhhZG9vcAAfaGl2ZS9oaXZlc2VydmVyQE5JRS5ORVR" +
-      "FQVNFLkNPTYoBmEC/zu2KAZhkzFLtjCqL5mKOEtAUbr+Tl2CACTcgnvac9RcxZAoMq28V" +
-      "SERGU19ERUxFR0FUSU9OX1RPS0VOEWhhLWhkZnM6ZmVuZ2h1YW5ndnRocmlmdDovL3NkY" +
-      "y5mZW5naHVhbmcud2FnZ2xlZGFuY2UuZ2RjLm5pZS5uZXRlYXNlLmNvbToyMDA1MCx0aH" +
-      "JpZnQ6Ly8xMC4xOTEuNTkuMTYyOjIwMDUwLHRocmlmdDovLzEwLjE5MS41OS4xNjM6MjA" +
-      "wNTApAAZoYWRvb3AEaGl2ZQRoaXZligGYQL/PVYoBmGTMU1WMAVM2x40BBgsUIKFw7GME" +
-      "1U6N/ZhxObek/I1RA0sVSElWRV9ERUxFR0FUSU9OX1RPS0VOAA9oYS1oZGZzOmRpamlhb" +
-      "mc/AAZoYWRvb3AAH2hpdmUvaGl2ZXNlcnZlckBOSUUuTkVURUFTRS5DT02KAZhAv89Hig" +
-      "GYZMxTR4wBz4hHjgGVFOfgiMNZ/B2acCmYkV7P0euzVBXWFUhERlNfREVMRUdBVElPTl9" +
-      "UT0tFTg9oYS1oZGZzOmRpamlhbmcPaGEtaGRmczpqaW5nd2VpPwAGaGFkb29wAB9oaXZl" +
-      "L2hpdmVzZXJ2ZXJATklFLk5FVEVBU0UuQ09NigGYQL/PIYoBmGTMUyGMIPu5VY4WwBQH9" +
-      "xpTeUCxroeNIOCW0908k1ZbSBVIREZTX0RFTEVHQVRJT05fVE9LRU4PaGEtaGRmczpqaW" +
-      "5nd2VpEWhhLWhkZnM6aHVhbmdsb25nPwAGaGFkb29wAB9oaXZlL2hpdmVzZXJ2ZXJATkl" +
-      "FLk5FVEVBU0UuQ09NigGYQL/PAIoBmGTMUwCMHv0cmI4bCBQOKo3I+WxPcz+nrXlGdbZ/" +
-      "nCPKyRVIREZTX0RFTEVHQVRJT05fVE9LRU4RaGEtaGRmczpodWFuZ2xvbmcSaGEtaGRmc" +
-      "zpnZGNjbHVzdGVyPwAGaGFkb29wAB9oaXZlL2hpdmVzZXJ2ZXJATklFLk5FVEVBU0UuQ0" +
-      "9NigGYQL/OvYoBmGTMUr2Ef72TD44URBSQajq5T6KZuMgk7cFuIHz7PAvGixVIREZTX0R" +
-      "FTEVHQVRJT05fVE9LRU4SaGEtaGRmczpnZGNjbHVzdGVyE2hhLWhkZnM6Z2RjY2x1c3Rl" +
-      "cjI/AAZoYWRvb3AAH2hpdmUvaGl2ZXNlcnZlckBOSUUuTkVURUFTRS5DT02KAZhAv88Qi" +
-      "gGYZMxTEIwSFo7AjgepFEwXJHRr7YVk7fxXxfRcbElkLI1QFUhERlNfREVMRUdBVElPTl" +
-      "9UT0tFThNoYS1oZGZzOmdkY2NsdXN0ZXIyAA=="
+    val tokenStr = "SERUUwABDzEyNy4wLjAuMTo0NTQ2MkIKA3dobxopY2xpZW50L2xvY2FsaG9zdEBLRVJC" +
+      "RVJJWkVEVEVTVEhFTFBFUi5DT00guMuGgJEzKLjTuKCTMzABOAIUqTa2O5pYh2dBXFNnpqEgIJvWF5sTU" +
+      "k1fREVMRUdBVElPTl9UT0tFTg8xMjcuMC4wLjE6NDU0NjIA"
     conf1.set(KYUUBI_ENGINE_CREDENTIALS_KEY, tokenStr)
-    conf1.set(ENGINE_EXTERNAL_ENABLED, true)
+    conf1.set(ENGINE_EXTERNAL_TOKEN_ENABLED, true)
     val builder1 = new SparkProcessBuilder("", true, conf1)
     assert(builder1.env.contains(HADOOP_TOKEN_FILE_LOCATION))
     assert(builder1.env.contains(ENV_KERBEROS_TGT) &&