Browse Source

YARN-2010. Document yarn.resourcemanager.zk-auth and its scope. (Robert Kanter via kasha)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1598636 13f79535-47bb-0310-9956-ffa450edef68
Karthik Kambatla 11 years ago
parent
commit
75112e97b4

+ 3 - 0
hadoop-yarn-project/CHANGES.txt

@@ -120,6 +120,9 @@ Release 2.5.0 - UNRELEASED
     YARN-2054. Better defaults for YARN ZK configs for retries and retry-inteval 
     YARN-2054. Better defaults for YARN ZK configs for retries and retry-inteval 
     when HA is enabled. (kasha)
     when HA is enabled. (kasha)
 
 
+    YARN-2010. Document yarn.resourcemanager.zk-auth and its scope. 
+    (Robert Kanter via kasha)
+
   OPTIMIZATIONS
   OPTIMIZATIONS
 
 
   BUG FIXES 
   BUG FIXES 

+ 12 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml

@@ -372,6 +372,18 @@
     <name>yarn.resourcemanager.zk-state-store.root-node.acl</name>
     <name>yarn.resourcemanager.zk-state-store.root-node.acl</name>
   </property>
   </property>
 
 
+  <property>
+    <description>
+        Specify the auths to be used for the ACL's specified in both the
+        yarn.resourcemanager.zk-acl and
+        yarn.resourcemanager.zk-state-store.root-node.acl properties.  This
+        takes a comma-separated list of authentication mechanisms, each of the
+        form 'scheme:auth' (the same syntax used for the 'addAuth' command in
+        the ZK CLI).
+    </description>
+    <name>yarn.resourcemanager.zk-auth</name>
+  </property>
+
   <property>
   <property>
     <description>URI pointing to the location of the FileSystem path where
     <description>URI pointing to the location of the FileSystem path where
     RM state will be stored. This must be supplied when using
     RM state will be stored. This must be supplied when using