Skip to content

Commit ddd713f

Browse files
committed
fix
1 parent 48b9b22 commit ddd713f

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,14 @@ class SparkProcessBuilder(
9999
buffer += s"spark.kubernetes.executorEnv.SPARK_USER_NAME=$userName"
100100
}
101101

102-
// iff the keytab is specified, PROXY_USER is not supported
103-
val shortUserName = useKeytab()
104-
if (shortUserName.nonEmpty) {
105-
setSparkUserName(shortUserName.get)
106-
} else {
107-
setSparkUserName(proxyUser)
108-
buffer += PROXY_USER
109-
buffer += proxyUser
102+
// if the keytab is specified, PROXY_USER is not supported
103+
tryKeytab() match {
104+
case None =>
105+
setSparkUserName(proxyUser)
106+
buffer += PROXY_USER
107+
buffer += proxyUser
108+
case Some(name) =>
109+
setSparkUserName(name)
110110
}
111111

112112
mainResource.foreach { r => buffer += r }
@@ -116,7 +116,7 @@ class SparkProcessBuilder(
116116

117117
override protected def module: String = "kyuubi-spark-sql-engine"
118118

119-
private def useKeytab(): Option[String] = {
119+
private def tryKeytab(): Option[String] = {
120120
val principal = conf.getOption(PRINCIPAL)
121121
val keytab = conf.getOption(KEYTAB)
122122
if (principal.isEmpty || keytab.isEmpty) {

0 commit comments

Comments
 (0)