You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/02/04 00:26:50 UTC
[2/3] flink git commit: [FLINK-3161] [dist] Externalize cluster
start-up and tear-down when available
[FLINK-3161] [dist] Externalize cluster start-up and tear-down when available
Parallelizes cluster start-up and tear-down when pdsh is available
This closes #1523
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f7d19115
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f7d19115
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f7d19115
Branch: refs/heads/master
Commit: f7d1911518da4bd1b4f742e5b4525e7867665f51
Parents: 934774f
Author: Greg Hogan <co...@greghogan.com>
Authored: Fri Jan 15 16:16:34 2016 -0500
Committer: Fabian Hueske <fh...@apache.org>
Committed: Wed Feb 3 22:07:48 2016 +0100
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/start-cluster.sh | 14 ++++++++++----
flink-dist/src/main/flink-bin/bin/stop-cluster.sh | 14 ++++++++++----
2 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f7d19115/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 4ed1a61..a22eb8d 100755
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
@@ -49,9 +49,15 @@ else
fi
shopt -u nocasematch
-# Start TaskManager instance(s)
+# Start TaskManager instance(s) using pdsh (Parallel Distributed Shell) when available
readSlaves
-for slave in ${SLAVES[@]}; do
- ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" start &"
-done
+command -v pdsh >/dev/null 2>&1
+if [[ $? -ne 0 ]]; then
+ for slave in ${SLAVES[@]}; do
+ 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[*]}") \
+ "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" start"
+fi
http://git-wip-us.apache.org/repos/asf/flink/blob/f7d19115/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
index ee5c210..c4d9086 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
@@ -22,12 +22,18 @@ bin=`cd "$bin"; pwd`
. "$bin"/config.sh
-# Stop TaskManager instance(s)
+# Stop TaskManager instance(s) using pdsh (Parallel Distributed Shell) when available
readSlaves
-for slave in ${SLAVES[@]}; do
- ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" stop &"
-done
+command -v pdsh >/dev/null 2>&1
+if [[ $? -ne 0 ]]; then
+ for slave in ${SLAVES[@]}; do
+ ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" stop &"
+ done
+else
+ PDSH_SSH_ARGS="" PDSH_SSH_ARGS_APPEND=$FLINK_SSH_OPTS pdsh -w $(IFS=, ; echo "${SLAVES[*]}") \
+ "nohup /bin/bash -l \"${FLINK_BIN_DIR}/taskmanager.sh\" stop"
+fi
# Stop JobManager instance(s)
shopt -s nocasematch