From 7364ce180425838801f8ca6adb71bf8c3ec851da Mon Sep 17 00:00:00 2001
From: Till Rohrmann <trohrmann@apache.org>
Date: Mon, 31 Aug 2015 17:15:44 +0200
Subject: [PATCH] [scripts] Adds example settings for zookeeper ha to default
 flink-conf.yaml

---
 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(-)

diff --git a/flink-dist/src/main/flink-bin/bin/config.sh b/flink-dist/src/main/flink-bin/bin/config.sh
index 04afa022fb2..2aa9c7844eb 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"
 }
diff --git a/flink-dist/src/main/flink-bin/conf/masters b/flink-dist/src/main/flink-bin/conf/masters
index 2fbb50c4a8d..f47e33e59d4 100644
--- a/flink-dist/src/main/flink-bin/conf/masters
+++ b/flink-dist/src/main/flink-bin/conf/masters
@@ -1 +1 @@
-localhost
+localhost:8081
diff --git a/flink-dist/src/main/resources/flink-conf.yaml b/flink-dist/src/main/resources/flink-conf.yaml
index 34d079050b3..8ecd59cc028 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
-- 
GitLab