Author: elserj
Date: Thu Oct 15 02:03:28 2015
New Revision: 1708722
URL: http://svn.apache.org/viewvc?rev=1708722&view=rev
Log:
SLIDER-949 Resource Specification doc fixes (Sherry Guo)
Modified:
incubator/slider/site/trunk/content/docs/configuration/resources.md
Modified: incubator/slider/site/trunk/content/docs/configuration/resources.md
URL:
http://svn.apache.org/viewvc/incubator/slider/site/trunk/content/docs/configuration/resources.md?rev=1708722&r1=1708721&r2=1708722&view=diff
==============================================================================
--- incubator/slider/site/trunk/content/docs/configuration/resources.md
(original)
+++ incubator/slider/site/trunk/content/docs/configuration/resources.md Thu Oct
15 02:03:28 2015
@@ -214,8 +214,8 @@ and another running program.
Slider reacts to a failed container by requesting a new container from YARN,
preferably on a host that has already hosted an instance of that role. Once
the container is allocated, slider will redeploy an instance of the component.
-As it may time for YARN to have the resources to allocate the container, it
-may take some time for the replacement to be instantiated.
+As it may take time for YARN to have the resources to allocate the container,
+replacements are not immediately instantiated.
Slider tracks failures in an attempt to differentiate problems in the
application package or its configuration from those of the underlying servers.
@@ -471,7 +471,7 @@ Example:
}
}
-This declares that the `HBASE_MASTER` placement should be escalated after one
second,
+This declares that the `HBASE_MASTER` placement should be escalated after ten
seconds,
but that that `HBASE_REGIONSERVER` instances should have an escalation timeout
of 600
seconds âten minutes. These values were chosen as an HBase Master can be
allocated
anywhere in the cluster, but a region server is significantly faster if
restarted
@@ -483,7 +483,7 @@ has taken place.
#### Notes
-1. Escalation goes directory from "specific node" to "anywhere in cluster"; it
does
+1. Escalation goes directly from "specific node" to "anywhere in cluster"; it
does
not have any intermediate "same-rack" policy.
1. If components were assigned to specific labels, then even when placement is
@@ -506,7 +506,7 @@ is not available or lacks capacity, the
## <a name="labels"></a>Using Labels
-The `resources.json` file include specifications the labels to be used when
allocating containers for the components. The details of the YARN Label feature
can be found at [YARN-796](https://issues.apache.org/jira/browse/YARN-796).
+The `resources.json` file includes specifications of the labels to be used
when allocating containers for the components. The details of the YARN Label
feature can be found at
[YARN-796](https://issues.apache.org/jira/browse/YARN-796).
In summary:
