You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2015/08/31 15:36:43 UTC
flink git commit: [scripts] Fixes correct Flink bin path usage in
scripts
Repository: flink
Updated Branches:
refs/heads/master 6b0c0e4c0 -> 8aa8e4f94
[scripts] Fixes correct Flink bin path usage in scripts
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8aa8e4f9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8aa8e4f9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8aa8e4f9
Branch: refs/heads/master
Commit: 8aa8e4f94f14363c0f17ef824ea847aaab54d3b4
Parents: 6b0c0e4
Author: Till Rohrmann <tr...@apache.org>
Authored: Mon Aug 31 14:50:48 2015 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Mon Aug 31 15:36:12 2015 +0200
----------------------------------------------------------------------
.../java/org/apache/flink/configuration/ConfigConstants.java | 4 ++--
flink-dist/src/main/flink-bin/bin/jobmanager.sh | 2 +-
flink-dist/src/main/flink-bin/bin/start-cluster.sh | 2 +-
flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh | 2 +-
flink-dist/src/main/flink-bin/bin/stop-cluster.sh | 6 +++---
flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh | 2 +-
flink-dist/src/main/flink-bin/bin/taskmanager.sh | 2 +-
flink-dist/src/main/flink-bin/bin/zookeeper.sh | 2 +-
8 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
index dc242b2..9ec71d2 100644
--- a/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
+++ b/flink-core/src/main/java/org/apache/flink/configuration/ConfigConstants.java
@@ -452,12 +452,12 @@ public final class ConfigConstants {
public static final String FLINK_JVM_OPTIONS = "env.java.opts";
- // --------------------------- Recovery -----------------------------------
+ // --------------------------- Recovery -----------------------------------
/** Defines recovery mode used for the cluster execution ("standalone", "zookeeper") */
public static final String RECOVERY_MODE = "recovery.mode";
- // --------------------------- ZooKeeper ----------------------------------
+ // --------------------------- ZooKeeper ----------------------------------
/** ZooKeeper servers. */
public static final String ZOOKEEPER_QUORUM_KEY = "ha.zookeeper.quorum";
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/flink-dist/src/main/flink-bin/bin/jobmanager.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/jobmanager.sh b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
index c89f53a..c18a909 100755
--- a/flink-dist/src/main/flink-bin/bin/jobmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/jobmanager.sh
@@ -72,4 +72,4 @@ if [[ $STARTSTOP == "start" ]]; then
fi
fi
-${bin}/flink-daemon.sh $STARTSTOP jobmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP jobmanager "${args}"
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/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 1fdd885..6cf9dda 100755
--- a/flink-dist/src/main/flink-bin/bin/start-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-cluster.sh
@@ -49,7 +49,7 @@ else
echo "Starting cluster (${STREAMING_MODE} mode)."
# Start single JobManager on this machine
- "$bin"/jobmanager.sh start cluster ${STREAMING_MODE}
+ "$FLINK_BIN_DIR"/jobmanager.sh start cluster ${STREAMING_MODE}
fi
shopt -u nocasematch
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
index d2ff914..67d5349 100755
--- a/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/start-zookeeper-quorum.sh
@@ -39,7 +39,7 @@ while read server ; do
id=${BASH_REMATCH[1]}
address=${BASH_REMATCH[2]}
- ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $bin/zookeeper.sh start $id &"
+ ssh -n $FLINK_SSH_OPTS $address -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh start $id &"
else
echo "[WARN] Parse error. Skipping config entry '$server'."
fi
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/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 d6dd572..d8676be 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-cluster.sh
@@ -26,7 +26,7 @@ bin=`cd "$bin"; pwd`
readSlaves
for slave in ${SLAVES[@]}; do
- ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $bin/taskmanager.sh stop &"
+ ssh -n $FLINK_SSH_OPTS $slave -- "nohup /bin/bash -l $FLINK_BIN_DIR/taskmanager.sh stop &"
done
# Stop JobManager instance(s)
@@ -36,10 +36,10 @@ if [[ $RECOVERY_MODE == "zookeeper" ]]; then
readMasters
for master in ${MASTERS[@]}; do
- ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $bin/jobmanager.sh stop &"
+ ssh -n $FLINK_SSH_OPTS $master -- "nohup /bin/bash -l $FLINK_BIN_DIR/jobmanager.sh stop &"
done
else
- "$bin"/jobmanager.sh stop
+ "$FLINK_BIN_DIR"/jobmanager.sh stop
fi
shopt -u nocasematch
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
index 4d19cbd..b306648 100755
--- a/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
+++ b/flink-dist/src/main/flink-bin/bin/stop-zookeeper-quorum.sh
@@ -39,7 +39,7 @@ while read server ; do
id=${BASH_REMATCH[1]}
server=${BASH_REMATCH[2]}
- ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $bin/zookeeper.sh stop &"
+ ssh -n $FLINK_SSH_OPTS $server -- "nohup /bin/bash -l $FLINK_BIN_DIR/zookeeper.sh stop &"
else
echo "[WARN] Parse error. Skipping config entry '$server'."
fi
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/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 2bc20d9..c41270d 100755
--- a/flink-dist/src/main/flink-bin/bin/taskmanager.sh
+++ b/flink-dist/src/main/flink-bin/bin/taskmanager.sh
@@ -64,4 +64,4 @@ if [[ $STARTSTOP == "start" ]]; then
args="--configDir ${FLINK_CONF_DIR} --streamingMode ${STREAMINGMODE}"
fi
-${bin}/flink-daemon.sh $STARTSTOP taskmanager "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP taskmanager "${args}"
http://git-wip-us.apache.org/repos/asf/flink/blob/8aa8e4f9/flink-dist/src/main/flink-bin/bin/zookeeper.sh
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/bin/zookeeper.sh b/flink-dist/src/main/flink-bin/bin/zookeeper.sh
index 0bbf6d5..a476989 100755
--- a/flink-dist/src/main/flink-bin/bin/zookeeper.sh
+++ b/flink-dist/src/main/flink-bin/bin/zookeeper.sh
@@ -53,4 +53,4 @@ if [[ $STARTSTOP == "start" ]]; then
args="--zkConfigFile $ZK_CONF --peerId $PEER_ID"
fi
-${bin}/flink-daemon.sh $STARTSTOP zookeeper "${args}"
+${FLINK_BIN_DIR}/flink-daemon.sh $STARTSTOP zookeeper "${args}"