This is an automated email from the ASF dual-hosted git repository.
trohrmann pushed a commit to branch release-1.10
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7fc5a127405eed684284da51fd816e4bd6e0fa51
Author: Jun Qin <11677043+qinjunje...@users.noreply.github.com>
AuthorDate: Wed Apr 1 10:50:55 2020 +0200
[FLINK-9656][scripts] Take also env.java.opts from flink-conf.yaml at the
client side
---
flink-dist/src/main/flink-bin/bin/flink | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/flink-dist/src/main/flink-bin/bin/flink
b/flink-dist/src/main/flink-bin/bin/flink
index 9e01d4b..ae1a11e 100644
--- a/flink-dist/src/main/flink-bin/bin/flink
+++ b/flink-dist/src/main/flink-bin/bin/flink
@@ -49,4 +49,4 @@
log=$FLINK_LOG_DIR/flink-$FLINK_IDENT_STRING-client-$HOSTNAME.log
log_setting=(-Dlog.file="$log"
-Dlog4j.configuration=file:"$FLINK_CONF_DIR"/log4j-cli.properties
-Dlogback.configurationFile=file:"$FLINK_CONF_DIR"/logback.xml)
# Add HADOOP_CLASSPATH to allow the usage of Hadoop file systems
-exec $JAVA_RUN $JVM_ARGS "${log_setting[@]}" -classpath "`manglePathList
"$CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS"`"
org.apache.flink.client.cli.CliFrontend "$@"
+exec $JAVA_RUN $JVM_ARGS $FLINK_ENV_JAVA_OPTS "${log_setting[@]}" -classpath
"`manglePathList "$CC_CLASSPATH:$INTERNAL_HADOOP_CLASSPATHS"`"
org.apache.flink.client.cli.CliFrontend "$@"
