YARN-1918. Typo in description and error message for yarn.resourcemanager.cluster-id (Anandha L Ranganathan via aw)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1618072 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
178c37bd0d
commit
b07e476da7
|
@ -116,6 +116,9 @@ Release 2.6.0 - UNRELEASED
|
||||||
YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc
|
YARN-2197. Add a link to YARN CHANGES.txt in the left side of doc
|
||||||
(Akira AJISAKA via aw)
|
(Akira AJISAKA via aw)
|
||||||
|
|
||||||
|
YARN-1918. Typo in description and error message for
|
||||||
|
'yarn.resourcemanager.cluster-id' (Anandha L Ranganathan via aw)
|
||||||
|
|
||||||
OPTIMIZATIONS
|
OPTIMIZATIONS
|
||||||
|
|
||||||
BUG FIXES
|
BUG FIXES
|
||||||
|
|
|
@ -1370,7 +1370,7 @@ public class YarnConfiguration extends Configuration {
|
||||||
public static String getClusterId(Configuration conf) {
|
public static String getClusterId(Configuration conf) {
|
||||||
String clusterId = conf.get(YarnConfiguration.RM_CLUSTER_ID);
|
String clusterId = conf.get(YarnConfiguration.RM_CLUSTER_ID);
|
||||||
if (clusterId == null) {
|
if (clusterId == null) {
|
||||||
throw new HadoopIllegalArgumentException("Configuration doesn't specify" +
|
throw new HadoopIllegalArgumentException("Configuration doesn't specify " +
|
||||||
YarnConfiguration.RM_CLUSTER_ID);
|
YarnConfiguration.RM_CLUSTER_ID);
|
||||||
}
|
}
|
||||||
return clusterId;
|
return clusterId;
|
||||||
|
|
|
@ -474,7 +474,7 @@
|
||||||
<property>
|
<property>
|
||||||
<description>Name of the cluster. In a HA setting,
|
<description>Name of the cluster. In a HA setting,
|
||||||
this is used to ensure the RM participates in leader
|
this is used to ensure the RM participates in leader
|
||||||
election fo this cluster and ensures it does not affect
|
election for this cluster and ensures it does not affect
|
||||||
other clusters</description>
|
other clusters</description>
|
||||||
<name>yarn.resourcemanager.cluster-id</name>
|
<name>yarn.resourcemanager.cluster-id</name>
|
||||||
<!--value>yarn-cluster</value-->
|
<!--value>yarn-cluster</value-->
|
||||||
|
|
Loading…
Reference in New Issue