You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/05/06 17:47:47 UTC

[03/12] flink git commit: [hotfix] [build] Updated outdated config keys in default flink-conf.yaml

[hotfix] [build] Updated outdated config keys in 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/179c64e2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/179c64e2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/179c64e2

Branch: refs/heads/master
Commit: 179c64e2bdc13905f504c209413a464e721a1f54
Parents: f37988c
Author: Stephan Ewen <se...@apache.org>
Authored: Thu May 4 11:25:24 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Sat May 6 14:31:43 2017 +0200

----------------------------------------------------------------------
 flink-dist/src/main/resources/flink-conf.yaml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/179c64e2/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 446d992..12c90e1 100644
--- a/flink-dist/src/main/resources/flink-conf.yaml
+++ b/flink-dist/src/main/resources/flink-conf.yaml
@@ -165,15 +165,25 @@ jobmanager.web.port: 8081
 # High Availability
 #==============================================================================
 
+# The high-availability mode. Possible options are 'NONE' or 'zookeeper'.
+#
+# high-availability: zookeeper
+
+# The path where metadata for master recovery is persisted. While ZooKeeper stored
+# the small ground truth for checkpoint and leader election, this location stores
+# the larger objects, like persisted dataflow graphs.
+# 
+# Must be a durable file system that is accessible from all nodes
+# (like HDFS, S3, Ceph, nfs, ...) 
+#
+# high-availability.storageDir: hdfs:///flink/ha/
+
 # The list of ZooKeeper quorum peers that coordinate the high-availability
 # setup. This must be a list of the form:
-#
 # "host1:clientPort,host2:clientPort,..." (default clientPort: 2181)
 #
-
-# high-availability: zookeeper
 # high-availability.zookeeper.quorum: localhost:2181
-# high-availability.zookeeper.storageDir: hdfs:///flink/ha/
+
 
 # ACL options are based on https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html#sc_BuiltinACLSchemes
 # It can be either "creator" (ZOO_CREATE_ALL_ACL) or "open" (ZOO_OPEN_ACL_UNSAFE)