Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-12458. Retries is typoed to spell Retires in parts of hadoop-yarn and hadoop-common. Contributed by Neelesh Srinivas Salian. 

(cherry picked from commit c918f7be5e)
This commit is contained in:
Harsh J 2015-10-03 18:37:58 +05:30
parent caa970974c
commit 21b4ba48ce
6 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -35,6 +35,10 @@ Release 2.8.0 - UNRELEASED
IMPROVEMENTS IMPROVEMENTS
HADOOP-12458. Retries is typoed to spell Retires in parts of
hadoop-yarn and hadoop-common
(Neelesh Srinivas Salian via harsh)
HADOOP-12271. Hadoop Jar Error Should Be More Explanatory HADOOP-12271. Hadoop Jar Error Should Be More Explanatory
(Josh Elser via harsh) (Josh Elser via harsh)

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java
View File

@ -371,7 +371,7 @@ public String toString() {
/** /**
* Parse the given string as a MultipleLinearRandomRetry object. * Parse the given string as a MultipleLinearRandomRetry object.
* The format of the string is "t_1, n_1, t_2, n_2, ...", * The format of the string is "t_1, n_1, t_2, n_2, ...",
* where t_i and n_i are the i-th pair of sleep time and number of retires. * where t_i and n_i are the i-th pair of sleep time and number of retries.
* Note that the white spaces in the string are ignored. * Note that the white spaces in the string are ignored.
* *
* @return the parsed object, or null if the parsing fails. * @return the parsed object, or null if the parsing fails.

2
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
View File

@ -34,7 +34,7 @@ public class ServerSocketUtil {
* Port scan & allocate is how most other apps find ports * Port scan & allocate is how most other apps find ports
* *
* @param port given port * @param port given port
* @param retries number of retires * @param retries number of retries
* @return * @return
* @throws IOException * @throws IOException
*/ */

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java
View File

@ -153,9 +153,9 @@ private static void addDeprecatedKeys() {
public static final int DEFAULT_RM_AMLAUNCHER_THREAD_COUNT = 50; public static final int DEFAULT_RM_AMLAUNCHER_THREAD_COUNT = 50;
/** Retry times to connect with NM.*/ /** Retry times to connect with NM.*/
public static final String RM_NODEMANAGER_CONNECT_RETIRES = public static final String RM_NODEMANAGER_CONNECT_RETRIES =
RM_PREFIX + "nodemanager-connect-retries"; RM_PREFIX + "nodemanager-connect-retries";
public static final int DEFAULT_RM_NODEMANAGER_CONNECT_RETIRES = 10; public static final int DEFAULT_RM_NODEMANAGER_CONNECT_RETRIES = 10;
/** The Kerberos principal for the resource manager.*/ /** The Kerberos principal for the resource manager.*/
public static final String RM_PRINCIPAL = public static final String RM_PRINCIPAL =

2
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml
View File

@ -1834,7 +1834,7 @@
<property> <property>
<description> <description>
Default maximum number of retires for timeline servive client Default maximum number of retries for timeline service client
and value -1 means no limit. and value -1 means no limit.
</description> </description>
<name>yarn.timeline-service.client.max-retries</name> <name>yarn.timeline-service.client.max-retries</name>

4
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java
View File

@ -68,8 +68,8 @@ protected void serviceInit(Configuration conf) throws Exception {
Configuration newConf = new YarnConfiguration(conf); Configuration newConf = new YarnConfiguration(conf);
newConf.setInt(CommonConfigurationKeysPublic. newConf.setInt(CommonConfigurationKeysPublic.
IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SOCKET_TIMEOUTS_KEY, IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SOCKET_TIMEOUTS_KEY,
conf.getInt(YarnConfiguration.RM_NODEMANAGER_CONNECT_RETIRES, conf.getInt(YarnConfiguration.RM_NODEMANAGER_CONNECT_RETRIES,
YarnConfiguration.DEFAULT_RM_NODEMANAGER_CONNECT_RETIRES)); YarnConfiguration.DEFAULT_RM_NODEMANAGER_CONNECT_RETRIES));
setConfig(newConf); setConfig(newConf);
super.serviceInit(newConf); super.serviceInit(newConf);
} }