Skip to content

Commit fb6516a

Browse files
zwangshengpan3793
authored andcommitted
[KYUUBI #3527][SPARK][FOLLOWUP] spark.kubernetes.executorEnv should be spark.executorEnv
### _Why are the changes needed?_ Fix bug in #3527 Modify `spark.kubernetes.executorEnv` to `spark.executorEnv` ### _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 - [ ] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request - [x] Unit Test Closes #3591 from zwangsheng/follow/SPARK_USER_NAME. Closes #3527 7254fe9 [zwangsheng] fix executorEnv Authored-by: zwangsheng <[email protected]> Signed-off-by: Cheng Pan <[email protected]>
1 parent 612a82e commit fb6516a

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class SparkProcessBuilder(
9898
buffer += CONF
9999
buffer += s"spark.kubernetes.driverEnv.SPARK_USER_NAME=$userName"
100100
buffer += CONF
101-
buffer += s"spark.kubernetes.executorEnv.SPARK_USER_NAME=$userName"
101+
buffer += s"spark.executorEnv.SPARK_USER_NAME=$userName"
102102
}
103103
})
104104
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ class SparkProcessBuilderSuite extends KerberizedTestHelper with MockitoSugar {
277277
val b1 = new SparkProcessBuilder(proxyName, conf1)
278278
val c1 = b1.toString.split(' ')
279279
assert(c1.contains(s"spark.kubernetes.driverEnv.SPARK_USER_NAME=$proxyName"))
280-
assert(c1.contains(s"spark.kubernetes.executorEnv.SPARK_USER_NAME=$proxyName"))
280+
assert(c1.contains(s"spark.executorEnv.SPARK_USER_NAME=$proxyName"))
281281

282282
tryWithSecurityEnabled {
283283
val conf2 = conf.set("spark.master", "k8s://test:12345")
@@ -287,7 +287,7 @@ class SparkProcessBuilderSuite extends KerberizedTestHelper with MockitoSugar {
287287
val b2 = new SparkProcessBuilder(name, conf2)
288288
val c2 = b2.toString.split(' ')
289289
assert(c2.contains(s"spark.kubernetes.driverEnv.SPARK_USER_NAME=$name"))
290-
assert(c2.contains(s"spark.kubernetes.executorEnv.SPARK_USER_NAME=$name"))
290+
assert(c2.contains(s"spark.executorEnv.SPARK_USER_NAME=$name"))
291291
assert(!c2.contains(s"--proxy-user $name"))
292292
}
293293

@@ -296,7 +296,7 @@ class SparkProcessBuilderSuite extends KerberizedTestHelper with MockitoSugar {
296296
val b3 = new SparkProcessBuilder(proxyName, conf3)
297297
val c3 = b3.toString.split(' ')
298298
assert(!c3.contains(s"spark.kubernetes.driverEnv.SPARK_USER_NAME=$proxyName"))
299-
assert(!c3.contains(s"spark.kubernetes.executorEnv.SPARK_USER_NAME=$proxyName"))
299+
assert(!c3.contains(s"spark.executorEnv.SPARK_USER_NAME=$proxyName"))
300300
}
301301
}
302302

0 commit comments

Comments
 (0)