[incubator-kyuubi] branch master updated: [KYUUBI #2159][FLINK] Prevent loss of exception message line separator

[yao]

This is an automated email from the ASF dual-hosted git repository.

yao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 4eb5df3  [KYUUBI #2159][FLINK] Prevent loss of exception message line 
separator
4eb5df3 is described below

commit 4eb5df342e3de3feae081bd4538ad0267c7d00b0
Author: Ada Wong <r...@foxmail.com>
AuthorDate: Sat Mar 19 14:58:48 2022 +0800

    [KYUUBI #2159][FLINK] Prevent loss of exception message line separator
    
    ### _Why are the changes needed?_
    
    Flink SQL Exception message loses line separator.
    
    ### _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
    
    - [x] [Run 
test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests)
 locally before make a pull request
    
    Closes #2161 from deadwind4/KYUUBI-2159-newline.
    
    Closes #2159
    
    15e311d6 [Ada Wong] use filter
    419b44e4 [Ada Wong] Use white list to filter
    5cd80ebb [Ada Wong] [KYUUBI #2159][FLINK] Prevent loss of exception message 
line separator
    
    Authored-by: Ada Wong <r...@foxmail.com>
    Signed-off-by: Kent Yao <y...@apache.org>
---
 .../scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilder.scala   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git 
a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilder.scala
 
b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilder.scala
index ec4938c..72bb655 100644
--- 
a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilder.scala
+++ 
b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/flink/FlinkProcessBuilder.scala
@@ -98,7 +98,10 @@ class FlinkProcessBuilder(
     ("FLINK_CONF_DIR" -> s"$FLINK_HOME/conf") +
     ("FLINK_SQL_ENGINE_JAR" -> mainResource.get) +
     ("FLINK_SQL_ENGINE_DYNAMIC_ARGS" ->
-      conf.getAll.map { case (k, v) => s"-D$k=$v" }.mkString(" "))
+      conf.getAll.filter { case (k, _) =>
+        k.startsWith("kyuubi.") || k.startsWith("flink.") ||
+          k.startsWith("hadoop.") || k.startsWith("yarn.")
+      }.map { case (k, v) => s"-D$k=$v" }.mkString(" "))
 
   override protected def commands: Array[String] = Array(executable)