flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ches...@apache.org
Subject [2/3] flink git commit: [FLINK-6628] Fix start scripts on Windows
Date Sat, 20 May 2017 17:32:20 GMT
[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/1bd75991
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1bd75991
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1bd75991

Branch: refs/heads/release-1.3
Commit: 1bd7599118851e32db1f3d4abad2cac1335e08cb
Parents: c35a177
Author: zentol <chesnay@apache.org>
Authored: Fri May 19 16:50:37 2017 +0200
Committer: zentol <chesnay@apache.org>
Committed: Sat May 20 16:05:40 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/1bd75991/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/1bd75991/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/1bd75991/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


Mime
View raw message