svn commit: r928839 - in /websites/staging/slider/trunk/content: ./ docs/high_availability.html

[buildbot]

Author: buildbot
Date: Tue Nov 11 21:21:59 2014
New Revision: 928839

Log:
Staging update by buildbot for slider

Modified:
    websites/staging/slider/trunk/content/   (props changed)
    websites/staging/slider/trunk/content/docs/high_availability.html

Propchange: websites/staging/slider/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Tue Nov 11 21:21:59 2014
@@ -1 +1 @@
-1638368
+1638424

Modified: websites/staging/slider/trunk/content/docs/high_availability.html
==============================================================================
--- websites/staging/slider/trunk/content/docs/high_availability.html (original)
+++ websites/staging/slider/trunk/content/docs/high_availability.html Tue Nov 
11 21:21:59 2014
@@ -194,6 +194,21 @@ details on how to configure YARN's RM HA
       <span class="nt">&lt;/property&gt;</span>
 
       <span class="nt">&lt;property&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.ha.automatic-failover.enabled<span
 class="nt">&lt;/name&gt;</span>
+          <span class="nt">&lt;value&gt;</span>true<span 
class="nt">&lt;/value&gt;</span>
+      <span class="nt">&lt;/property&gt;</span>
+
+      <span class="nt">&lt;property&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.ha.automatic-failover.embedded<span
 class="nt">&lt;/name&gt;</span>
+          <span class="nt">&lt;value&gt;</span>true<span 
class="nt">&lt;/value&gt;</span>
+      <span class="nt">&lt;/property&gt;</span>
+
+      <span class="nt">&lt;property&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.client.failover-proxy-provider<span 
class="nt">&lt;/name&gt;</span>
+          <span 
class="nt">&lt;value&gt;</span>org.apache.hadoop.yarn.client.ConfiguredRMFailoverProxyProvider<span
 class="nt">&lt;/value&gt;</span>
+      <span class="nt">&lt;/property&gt;</span>
+
+      <span class="nt">&lt;property&gt;</span>
           <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.zk-address<span 
class="nt">&lt;/name&gt;</span>
           <span 
class="nt">&lt;value&gt;</span>192.168.1.9:2181,192.168.1.10:2181<span 
class="nt">&lt;/value&gt;</span>
           <span class="nt">&lt;description&gt;</span>For multiple zk services, 
separate them with comma<span class="nt">&lt;/description&gt;</span>
@@ -203,6 +218,16 @@ details on how to configure YARN's RM HA
           <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.cluster-id<span 
class="nt">&lt;/name&gt;</span>
           <span class="nt">&lt;value&gt;</span>yarn-cluster<span 
class="nt">&lt;/value&gt;</span>
       <span class="nt">&lt;/property&gt;</span>
+
+      <span class="nt">&lt;property&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.ha.automatic-failover.zk-base-path<span
 class="nt">&lt;/name&gt;</span>
+          <span class="nt">&lt;value&gt;</span>/yarn-leader-election<span 
class="nt">&lt;/value&gt;</span>
+      <span class="nt">&lt;/property&gt;</span>
+
+      <span class="nt">&lt;property&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.am.max-attempts<span 
class="nt">&lt;/name&gt;</span>
+          <span class="nt">&lt;value&gt;</span>20<span 
class="nt">&lt;/value&gt;</span>
+      <span class="nt">&lt;/property&gt;</span>
 </pre></div>
 
 
@@ -225,7 +250,7 @@ details on how to configure YARN's RM HA
                        private to YARN for experimenting the feature.  NOTE: 
this config
                        has to be set on both RM and ALL NMs
           <span class="nt">&lt;/description&gt;</span>
-          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.work­preserving­recovery.enabled<span
 class="nt">&lt;/name&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.work-preserving-recovery.enabled<span
 class="nt">&lt;/name&gt;</span>
           <span class="nt">&lt;value&gt;</span>true<span 
class="nt">&lt;/value&gt;</span>
       <span class="nt">&lt;/property&gt;</span>
 
@@ -242,7 +267,7 @@ details on how to configure YARN's RM HA
                        
org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore
                        as the value for yarn.resourcemanager.store.class
           <span class="nt">&lt;/description&gt;</span>
-          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.zk­address<span 
class="nt">&lt;/name&gt;</span>
+          <span 
class="nt">&lt;name&gt;</span>yarn.resourcemanager.zk­-address<span 
class="nt">&lt;/name&gt;</span>
           <span class="nt">&lt;value&gt;</span>127.0.0.1:2181<span 
class="nt">&lt;/value&gt;</span>
       <span class="nt">&lt;/property&gt;</span>
 </pre></div>