Skip to content

Commit 23380f7

Browse files
Rename config name to kyuubi.session.spark.file.config.list
1 parent 418fd22 commit 23380f7

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,8 +1873,8 @@ object KyuubiConf {
18731873
.toSet()
18741874
.createWithDefault(Set.empty)
18751875

1876-
val SPARK_FILE_CONFIG_LIST: ConfigEntry[Set[String]] =
1877-
buildConf("kyuubi.spark.file.config.list")
1876+
val SESSION_SPARK_FILE_CONFIG_LIST: ConfigEntry[Set[String]] =
1877+
buildConf("kyuubi.session.spark.file.config.list")
18781878
.doc(s"A comma-separated list of additional Spark parameters for which Kyuubi checks " +
18791879
s"whether the upload path is included in ${SESSION_LOCAL_DIR_ALLOW_LIST.key}.")
18801880
.version("1.12.0")

kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KyuubiApplicationManager.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ object KyuubiApplicationManager {
177177
kyuubiConf: KyuubiConf): Unit = {
178178
if (kyuubiConf.get(KyuubiConf.SESSION_LOCAL_DIR_ALLOW_LIST).nonEmpty) {
179179
(SparkProcessBuilder.PATH_CONFIGS.toSet ++
180-
kyuubiConf.get(KyuubiConf.SPARK_FILE_CONFIG_LIST)).flatMap { key =>
180+
kyuubiConf.get(KyuubiConf.SESSION_SPARK_FILE_CONFIG_LIST)).flatMap { key =>
181181
appConf.get(key).map(_.split(",")).getOrElse(Array.empty)
182182
}.filter(_.nonEmpty).foreach { path =>
183183
checkApplicationAccessPath(path, kyuubiConf)

kyuubi-server/src/test/scala/org/apache/kyuubi/engine/KyuubiApplicationManagerSuite.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class KyuubiApplicationManagerSuite extends KyuubiFunSuite {
9898
appConf,
9999
noLocalDirLimitConf)
100100

101-
localDirLimitConf.set(KyuubiConf.SPARK_FILE_CONFIG_LIST, Set("spark.new.access.local"))
101+
localDirLimitConf.set(KyuubiConf.SESSION_SPARK_FILE_CONFIG_LIST, Set("spark.new.access.local"))
102102
appConf = Map("spark.new.access.local" -> "/apache/kyuubi/jars/a.jar")
103103
KyuubiApplicationManager.checkApplicationAccessPaths(
104104
"SPARK",
@@ -112,7 +112,7 @@ class KyuubiApplicationManagerSuite extends KyuubiFunSuite {
112112
appConf,
113113
localDirLimitConf)
114114
}
115-
localDirLimitConf.unset(KyuubiConf.SPARK_FILE_CONFIG_LIST)
115+
localDirLimitConf.unset(KyuubiConf.SESSION_SPARK_FILE_CONFIG_LIST)
116116
}
117117

118118
test("Test kyuubi application Manager tag spark on kubernetes application") {

0 commit comments

Comments
 (0)