You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by dw...@apache.org on 2018/07/18 13:31:10 UTC
flink git commit: [FLINK-9866][hotfix] Pass program arguments last to
standalone-job.sh
Repository: flink
Updated Branches:
refs/heads/master a457a355d -> 5735fabff
[FLINK-9866][hotfix] Pass program arguments last to standalone-job.sh
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5735fabf
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5735fabf
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5735fabf
Branch: refs/heads/master
Commit: 5735fabffcd2504f54c712f86bd59043ea19e6ce
Parents: a457a35
Author: Dawid Wysakowicz <dw...@apache.org>
Authored: Wed Jul 18 15:17:32 2018 +0200
Committer: Dawid Wysakowicz <dw...@apache.org>
Committed: Wed Jul 18 15:30:47 2018 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/standalone-job.sh | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5735fabf/flink-dist/src/main/flink-bin/bin/standalone-job.sh
----------------------------------------------------------------------
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 586a8ba..889dab8 100644
--- a/flink-dist/src/main/flink-bin/bin/standalone-job.sh
+++ b/flink-dist/src/main/flink-bin/bin/standalone-job.sh
@@ -23,8 +23,6 @@ USAGE="Usage: standalone-job.sh ((start|start-foreground))|stop"
STARTSTOP=$1
ENTRY_POINT_NAME="standalonejob"
-ARGS=("${@:2}")
-
if [[ $STARTSTOP != "start" ]] && [[ $STARTSTOP != "start-foreground" ]] && [[ $STARTSTOP != "stop" ]] || [[ -z JOB_CLASSNAME ]]; then
echo $USAGE
exit 1
@@ -35,6 +33,9 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
+# Startup parameters
+ARGS=("--configDir" "${FLINK_CONF_DIR}" "${@:2}")
+
if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
if [ ! -z "${FLINK_JM_HEAP_MB}" ] && [ "${FLINK_JM_HEAP}" == 0 ]; then
echo "used deprecated key \`${KEY_JOBM_MEM_MB}\`, please replace with key \`${KEY_JOBM_MEM_SIZE}\`"
@@ -54,9 +55,6 @@ if [[ $STARTSTOP == "start" ]] || [[ $STARTSTOP == "start-foreground" ]]; then
# Add cluster entry point specific JVM options
export FLINK_ENV_JAVA_OPTS="${FLINK_ENV_JAVA_OPTS} ${FLINK_ENV_JAVA_OPTS_JM}"
-
- # Startup parameters
- ARGS+=("--configDir" "${FLINK_CONF_DIR}")
fi
if [[ $STARTSTOP == "start-foreground" ]]; then