[flink] branch release-1.12 updated: [FLINK-21024][dist] Keep dynamic properties before job arguments.

[xtsong]

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

xtsong pushed a commit to branch release-1.12
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.12 by this push:
     new b95cf42  [FLINK-21024][dist] Keep dynamic properties before job 
arguments.
b95cf42 is described below

commit b95cf42ccc78bc22394537370dfabd778cff2f03
Author: Xintong Song <tonysong...@gmail.com>
AuthorDate: Tue Jan 19 19:05:32 2021 +0800

    [FLINK-21024][dist] Keep dynamic properties before job arguments.
    
    This closes #14697
---
 flink-dist/src/main/flink-bin/bin/standalone-job.sh         | 6 ++++--
 flink-dist/src/main/flink-bin/bin/taskmanager.sh            | 2 +-
 flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/flink-dist/src/main/flink-bin/bin/standalone-job.sh 
b/flink-dist/src/main/flink-bin/bin/standalone-job.sh
index 53f0f21..b4cfa20 100644
--- a/flink-dist/src/main/flink-bin/bin/standalone-job.sh
+++ b/flink-dist/src/main/flink-bin/bin/standalone-job.sh
@@ -34,7 +34,7 @@ bin=`cd "$bin"; pwd`
 . "$bin"/config.sh
 
 # Startup parameters
-ARGS=("--configDir" "${FLINK_CONF_DIR}" "${@:2}")
+ARGS=("${@:2}")
 
 if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
     # Add cluster entry point specific JVM options
@@ -42,10 +42,12 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == 
"start-foreground" ]]; then
     parseJmArgsAndExportLogs "${ARGS[@]}"
 
     if [ ! -z "${DYNAMIC_PARAMETERS}" ]; then
-        ARGS+=(${DYNAMIC_PARAMETERS[@]})
+        ARGS=(${DYNAMIC_PARAMETERS[@]} "${ARGS[@]}")
     fi
 fi
 
+ARGS=("--configDir" "${FLINK_CONF_DIR}" "${ARGS[@]}")
+
 if [[ $STARTSTOP == "start-foreground" ]]; then
     exec "${FLINK_BIN_DIR}"/flink-console.sh ${ENTRY_POINT_NAME} "${ARGS[@]}"
 else
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh 
b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index 4d0b72f..bd45f77 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -64,7 +64,7 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == 
"start-foreground" ]]; then
     export JVM_ARGS="${JVM_ARGS} ${jvm_params}"
 
     IFS=$" " dynamic_configs=$(echo "${params_output}" | tail -n 1)
-    ARGS+=("--configDir" "${FLINK_CONF_DIR}" ${dynamic_configs[@]})
+    ARGS=("--configDir" "${FLINK_CONF_DIR}" ${dynamic_configs[@]} "${ARGS[@]}")
 
     export FLINK_INHERITED_LOGS="
 $FLINK_INHERITED_LOGS
diff --git a/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh 
b/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
index 74ca53e..fe89f7d 100755
--- a/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/mesos-bin/mesos-jobmanager.sh
@@ -29,7 +29,7 @@ bin=$(cd "${bin}" || exit; pwd)
 parseJmArgsAndExportLogs "${ARGS[@]}"
 
 if [ ! -z "${DYNAMIC_PARAMETERS}" ]; then
-    ARGS+=(${DYNAMIC_PARAMETERS[@]})
+    ARGS=(${DYNAMIC_PARAMETERS[@]} "${ARGS[@]}")
 fi
 
 if [ "$FLINK_IDENT_STRING" = "" ]; then