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 17:16:31 UTC
flink git commit: [scripts] Adds example settings for zookeeper ha to
default flink-conf.yaml
Repository: flink
Updated Branches:
refs/heads/master 8aa8e4f94 -> 7364ce180
[scripts] Adds example settings for zookeeper ha to default flink-conf.yaml
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7364ce18
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7364ce18
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7364ce18
Branch: refs/heads/master
Commit: 7364ce180425838801f8ca6adb71bf8c3ec851da
Parents: 8aa8e4f
Author: Till Rohrmann <tr...@apache.org>
Authored: Mon Aug 31 17:15:44 2015 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Mon Aug 31 17:15:44 2015 +0200
----------------------------------------------------------------------
flink-dist/src/main/flink-bin/bin/config.sh | 9 +++++++--
flink-dist/src/main/flink-bin/conf/masters | 2 +-
flink-dist/src/main/resources/flink-conf.yaml | 6 ++++--
3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7364ce18/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 04afa02..2aa9c78 100755
--- a/flink-dist/src/main/flink-bin/bin/config.sh
+++ b/flink-dist/src/main/flink-bin/bin/config.sh
@@ -277,9 +277,14 @@ readMasters() {
if [ -n "$HOSTWEBUIPORT" ]; then
HOST=$(echo $HOSTWEBUIPORT | cut -f1 -d:)
- WEBUIPORT=$(echo $HOSTWEBUIPORT | cut -f2 -d:)
+ WEBUIPORT=$(echo $HOSTWEBUIPORT | cut -s -f2 -d:)
MASTERS+=(${HOST})
- WEBUIPORTS+=(${WEBUIPORT})
+
+ if [ -z "$WEBUIPORT" ]; then
+ WEBUIPORTS+=(0)
+ else
+ WEBUIPORTS+=(${WEBUIPORT})
+ fi
fi
done < "$MASTERS_FILE"
}
http://git-wip-us.apache.org/repos/asf/flink/blob/7364ce18/flink-dist/src/main/flink-bin/conf/masters
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/conf/masters b/flink-dist/src/main/flink-bin/conf/masters
index 2fbb50c..f47e33e 100644
--- a/flink-dist/src/main/flink-bin/conf/masters
+++ b/flink-dist/src/main/flink-bin/conf/masters
@@ -1 +1 @@
-localhost
+localhost:8081
http://git-wip-us.apache.org/repos/asf/flink/blob/7364ce18/flink-dist/src/main/resources/flink-conf.yaml
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml
index 34d0790..8ecd59c 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -136,5 +136,7 @@ state.backend: jobmanager
# The list of ZooKepper quorum peers that coordinate the high-availability
# setup. This must be a list of the form
# "host_1[:peerPort[:leaderPort]],host_2[:peerPort[:leaderPort]],..."
-
-#ha.zookeeper.quorum: localhost
\ No newline at end of file
+#
+# recovery.mode: zookeeper
+#
+# ha.zookeeper.quorum: localhost
\ No newline at end of file