This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch branch-1.9
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/branch-1.9 by this push:
new 4e01b3f38 [KYUUBI #5957] Flink engine should not load
kyuubi-defaults.conf
4e01b3f38 is described below
commit 4e01b3f38fcfeed8586de9f211f4ae9991cc88c0
Author: Cheng Pan <[email protected]>
AuthorDate: Thu Jun 6 16:06:51 2024 +0800
[KYUUBI #5957] Flink engine should not load kyuubi-defaults.conf
# :mag: Description
This is the root cause of #5957. Which is accidentally introduced in
https://github.com/apache/kyuubi/commit/b315123a6b6dfa7b03a5ab7875856bdfd4e0eaed,
thus affects 1.8.0, 1.8.1๏ผ 1.8.2, 1.9.0, 1.9.1.
`kyuubi-defaults.conf` is kind of a server side configuration file, all
Kyuubi confs engine required should be passed via CLI args to sub-process.
## Types of changes :bookmark:
- [x] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
## Test Plan ๐งช
Pass GHA.
---
# Checklist ๐
- [x] This patch was not authored or co-authored using [Generative
Tooling](https://www.apache.org/legal/generative-tooling.html)
**Be nice. Be informative.**
Closes #6455 from pan3793/flink-conf-load.
Closes #5957
2972fbc98 [Cheng Pan] Flink engine should not load kyuubi-defaults.conf
Authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
(cherry picked from commit fe5377e0fac06502d0de0bd06fa97fba0176fc5e)
Signed-off-by: Cheng Pan <[email protected]>
---
.../src/main/scala/org/apache/kyuubi/engine/flink/FlinkSQLEngine.scala | 1 -
1 file changed, 1 deletion(-)
diff --git
a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkSQLEngine.scala
b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkSQLEngine.scala
index dff9aa602..c3dc1c615 100644
---
a/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkSQLEngine.scala
+++
b/externals/kyuubi-flink-sql-engine/src/main/scala/org/apache/kyuubi/engine/flink/FlinkSQLEngine.scala
@@ -75,7 +75,6 @@ object FlinkSQLEngine extends Logging {
FlinkEngineUtils.checkFlinkVersion()
try {
- kyuubiConf.loadFileDefaults()
Utils.fromCommandLineArgs(args, kyuubiConf)
val flinkConfDir = sys.env.getOrElse(
"FLINK_CONF_DIR", {
