Skip to content

Commit 61fc167

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

4 files changed

Lines changed: 6 additions & 11 deletions

File tree

docs/configuration/settings.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -537,15 +537,10 @@ You can configure the Kyuubi properties in `$KYUUBI_HOME/conf/kyuubi-defaults.co
537537
| kyuubi.session.local.dir.allow.list || The local dir list that are allowed to access by the kyuubi session application. End-users might set some parameters such as `spark.files` and it will upload some local files when launching the kyuubi engine, if the local dir allow list is defined, kyuubi will check whether the path to upload is in the allow list. Note that, if it is empty, there is no limitation for that. And please use absolute paths. | set | 1.6.0 |
538538
| kyuubi.session.name | <undefined> | A human readable name of the session and we use empty string by default. This name will be recorded in the event. Note that, we only apply this value from session conf. | string | 1.4.0 |
539539
| kyuubi.session.proxy.user | <undefined> | An alternative to hive.server2.proxy.user. The current behavior is consistent with hive.server2.proxy.user and now only takes effect in RESTFul API. When both parameters are set, kyuubi.session.proxy.user takes precedence. | string | 1.9.0 |
540+
| kyuubi.session.spark.file.config.list || A comma-separated list of additional Spark parameters for which Kyuubi checks whether the upload path is included in kyuubi.session.local.dir.allow.list. | set | 1.12.0 |
540541
| kyuubi.session.timeout | PT6H | (deprecated)session timeout, it will be closed when it's not accessed for this duration | duration | 1.0.0 |
541542
| kyuubi.session.user.sign.enabled | false | Whether to verify the integrity of session user name on the engine side, e.g. Authz plugin in Spark. | boolean | 1.7.0 |
542543

543-
### Spark
544-
545-
| Key | Default | Meaning | Type | Since |
546-
|-----|---------|-----------------------------------------------------------------------------------------------------------------------------------------------------------|------|--------|
547-
| kyuubi.spark.file.config.list || A comma-separated list of additional Spark parameters for which Kyuubi checks whether the upload path is included in kyuubi.session.local.dir.allow.list. | set | 1.12.0 |
548-
549544
### Spnego
550545

551546
| Key | Default | Meaning | Type | Since |

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)