[flink] branch master updated: [FLINK-32980][scripts] Support env.java.opts.all & env.java.opts.cli config for starting Session cluster CLIs (#23308)

[huweihua]

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

huweihua pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 6dbb9b8d3fc [FLINK-32980][scripts] Support env.java.opts.all & 
env.java.opts.cli config for starting Session cluster CLIs (#23308)
6dbb9b8d3fc is described below

commit 6dbb9b8d3fcfe88a85b22e2f177e8fea7585702e
Author: Zhanghao Chen <m...@outlook.com>
AuthorDate: Tue Aug 29 10:48:08 2023 +0800

    [FLINK-32980][scripts] Support env.java.opts.all & env.java.opts.cli config 
for starting Session cluster CLIs (#23308)
---
 flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh | 5 ++++-
 flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh             | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh 
b/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
index 559a77689b5..ac3612546f2 100755
--- a/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
+++ b/flink-dist/src/main/flink-bin/kubernetes-bin/kubernetes-session.sh
@@ -36,4 +36,7 @@ log_setting="-Dlog.file="$log" 
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4
 
 export FLINK_CONF_DIR
 
-"$JAVA_RUN" $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting 
org.apache.flink.kubernetes.cli.KubernetesSessionCli "$@"
+# Add Client-specific JVM options
+FLINK_ENV_JAVA_OPTS="${FLINK_ENV_JAVA_OPTS} ${FLINK_ENV_JAVA_OPTS_CLI}"
+
+"$JAVA_RUN" $JVM_ARGS $FLINK_ENV_JAVA_OPTS -classpath "$CC_CLASSPATH" 
$log_setting org.apache.flink.kubernetes.cli.KubernetesSessionCli "$@"
diff --git a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh 
b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
index f36ca34f1a5..49cf826b6be 100755
--- a/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
+++ b/flink-dist/src/main/flink-bin/yarn-bin/yarn-session.sh
@@ -34,5 +34,8 @@ CC_CLASSPATH=`manglePathList 
$(constructFlinkClassPath):$INTERNAL_HADOOP_CLASSPA
 log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-yarn-session-$HOSTNAME.log
 log_setting="-Dlog.file="$log" 
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-session.properties 
-Dlog4j.configurationFile=file:"$FLINK_CONF_DIR"/log4j-session.properties 
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback-session.xml"
 
-"$JAVA_RUN" $JVM_ARGS -classpath "$CC_CLASSPATH" $log_setting 
org.apache.flink.yarn.cli.FlinkYarnSessionCli -j 
"$FLINK_LIB_DIR"/flink-dist*.jar "$@"
+# Add Client-specific JVM options
+FLINK_ENV_JAVA_OPTS="${FLINK_ENV_JAVA_OPTS} ${FLINK_ENV_JAVA_OPTS_CLI}"
+
+"$JAVA_RUN" $JVM_ARGS $FLINK_ENV_JAVA_OPTS -classpath "$CC_CLASSPATH" 
$log_setting org.apache.flink.yarn.cli.FlinkYarnSessionCli -j 
"$FLINK_LIB_DIR"/flink-dist*.jar "$@"