flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject flink git commit: [FLINK-4219] [scripts] Quote PDSH opts in start-cluster.sh
Date Fri, 05 Aug 2016 08:34:17 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.1 7768bb2de -> 5363e7ad7


[FLINK-4219] [scripts] Quote PDSH opts in start-cluster.sh

This prevents word splitting if the user configures multiple SSH
options.

This closes #2253.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5363e7ad
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5363e7ad
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5363e7ad

Branch: refs/heads/release-1.1
Commit: 5363e7ad7f83bcba9be5830639f3fbc940a8bc54
Parents: 7768bb2
Author: Greg Hogan <code@greghogan.com>
Authored: Thu Jul 14 13:40:35 2016 -0400
Committer: Ufuk Celebi <uce@apache.org>
Committed: Fri Aug 5 10:34:04 2016 +0200

----------------------------------------------------------------------
 flink-dist/src/main/flink-bin/bin/start-cluster.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/5363e7ad/flink-dist/src/main/flink-bin/bin/start-cluster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-cluster.sh b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
index a22eb8d..77bff1e 100755
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
@@ -58,6 +58,6 @@ if [[ $? -ne 0 ]]; then
         ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\"
start &"
     done
 else
-    PDSH_SSH_ARGS="" PDSH_SSH_ARGS_APPEND=$FLINK_SSH_OPTS pdsh -w $(IFS=, ; echo "${SLAVES[*]}")
\
+    PDSH_SSH_ARGS="" PDSH_SSH_ARGS_APPEND="${FLINK_SSH_OPTS}" pdsh -w $(IFS=, ; echo "${SLAVES[*]}")
\
         "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" start"
 fi


Mime
View raw message