You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2017/05/20 15:54:43 UTC
[2/3] flink git commit: [FLINK-6628] Fix start scripts on Windows
[FLINK-6628] Fix start scripts on Windows
This closes #3954.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/0a5b98e3
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/0a5b98e3
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/0a5b98e3
Branch: refs/heads/master
Commit: 0a5b98e34b73c5766a6a9d2b49f2eda70624cf26
Parents: b9e75ff
Author: zentol <ch...@apache.org>
Authored: Fri May 19 16:50:37 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Sat May 20 16:05:03 2017 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 2 +-
flink-dist/src/main/flink-bin/bin/flink-daemon.sh | 2 +-
flink-dist/src/main/flink-bin/bin/taskmanager.sh | 6 ++----
3 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/0a5b98e3/flink-dist/src/main/flink-bin/bin/config.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index d73b220..66f0d5b 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -391,7 +391,7 @@ rotateLogFilesWithPrefix() {
dir=$1
prefix=$2
while read -r log ; do
- rotateLogFile $log
+ rotateLogFile "$log"
# find distinct set of log file names, ignoring the rotation number (trailing dot and digit)
done < <(find "$dir" ! -type d -path "${prefix}*" | sed -E s/\.[0-9]+$// | sort | uniq)
}
http://git-wip-us.apache.org/repos/asf/flink/blob/0a5b98e3/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
index 8bb6f0b..e897a49 100644
--- a/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
+++ b/flink-dist/src/main/flink-bin/bin/flink-daemon.sh
@@ -97,7 +97,7 @@ case $STARTSTOP in
(start)
# Rotate log files
- rotateLogFilesWithPrefix $FLINK_LOG_DIR $FLINK_LOG_PREFIX
+ rotateLogFilesWithPrefix "$FLINK_LOG_DIR" "$FLINK_LOG_PREFIX"
# Print a warning if daemons are already running on host
if [ -f $pid ]; then
http://git-wip-us.apache.org/repos/asf/flink/blob/0a5b98e3/flink-dist/src/main/flink-bin/bin/taskmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/taskmanager.sh b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
index b16abc9..ba4fe1d 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -75,11 +75,9 @@ fi
if [[ $STARTSTOP == "start-foreground" ]]; then
exec "${FLINK_BIN_DIR}"/flink-console.sh taskmanager "${args[@]}"
else
- TM_COMMAND="${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP taskmanager ${args[@]}"
-
if [[ $FLINK_TM_COMPUTE_NUMA == "false" ]]; then
# Start a single TaskManager
- $TM_COMMAND
+ "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP taskmanager "${args[@]}"
else
# Example output from `numactl --show` on an AWS c4.8xlarge:
# policy: default
@@ -91,7 +89,7 @@ else
read -ra NODE_LIST <<< $(numactl --show | grep "^nodebind: ")
for NODE_ID in "${NODE_LIST[@]:1}"; do
# Start a TaskManager for each NUMA node
- numactl --membind=$NODE_ID --cpunodebind=$NODE_ID -- $TM_COMMAND
+ numactl --membind=$NODE_ID --cpunodebind=$NODE_ID -- "${FLINK_BIN_DIR}"/flink-daemon.sh $STARTSTOP taskmanager "${args[@]}"
done
fi
fi