Repository: hadoop Updated Branches: refs/heads/branch-2 caa970974 -> 21b4ba48c
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 c918f7be5e6aecaa3cb0c23a95819329802d32d4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/21b4ba48 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/21b4ba48 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/21b4ba48 Branch: refs/heads/branch-2 Commit: 21b4ba48ce3f6e8d7e7895202ad22978c9be392d Parents: caa9709 Author: Harsh J <[email protected]> Authored: Sat Oct 3 18:37:58 2015 +0530 Committer: Harsh J <[email protected]> Committed: Sat Oct 3 18:39:22 2015 +0530 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++++ .../src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java | 2 +- .../src/test/java/org/apache/hadoop/net/ServerSocketUtil.java | 2 +- .../main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java | 4 ++-- .../hadoop-yarn-common/src/main/resources/yarn-default.xml | 2 +- .../resourcemanager/amlauncher/ApplicationMasterLauncher.java | 4 ++-- 6 files changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index b873ba6..3f933b2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -35,6 +35,10 @@ Release 2.8.0 - UNRELEASED 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 (Josh Elser via harsh) http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java index 871a8ba..f978ae7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryPolicies.java @@ -371,7 +371,7 @@ public class RetryPolicies { /** * Parse the given string as a MultipleLinearRandomRetry object. * 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. * * @return the parsed object, or null if the parsing fails. http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java index 1917287..3685162 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java @@ -34,7 +34,7 @@ public class ServerSocketUtil { * Port scan & allocate is how most other apps find ports * * @param port given port - * @param retries number of retires + * @param retries number of retries * @return * @throws IOException */ http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java index 848907f..3fbea1a 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java @@ -153,9 +153,9 @@ public class YarnConfiguration extends Configuration { public static final int DEFAULT_RM_AMLAUNCHER_THREAD_COUNT = 50; /** 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"; - 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.*/ public static final String RM_PRINCIPAL = http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml index c8bca8e..f2e2f01 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/resources/yarn-default.xml @@ -1834,7 +1834,7 @@ <property> <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. </description> <name>yarn.timeline-service.client.max-retries</name> http://git-wip-us.apache.org/repos/asf/hadoop/blob/21b4ba48/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java index f606e45..0d172f4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/amlauncher/ApplicationMasterLauncher.java @@ -68,8 +68,8 @@ public class ApplicationMasterLauncher extends AbstractService implements Configuration newConf = new YarnConfiguration(conf); newConf.setInt(CommonConfigurationKeysPublic. IPC_CLIENT_CONNECT_MAX_RETRIES_ON_SOCKET_TIMEOUTS_KEY, - conf.getInt(YarnConfiguration.RM_NODEMANAGER_CONNECT_RETIRES, - YarnConfiguration.DEFAULT_RM_NODEMANAGER_CONNECT_RETIRES)); + conf.getInt(YarnConfiguration.RM_NODEMANAGER_CONNECT_RETRIES, + YarnConfiguration.DEFAULT_RM_NODEMANAGER_CONNECT_RETRIES)); setConfig(newConf); super.serviceInit(newConf); }
