YARN-4113. RM should respect retry-interval when uses RetryPolicies.RETRY_FOREVER. (Sunil G via wangda)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b00392dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b00392dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b00392dd Branch: refs/heads/HDFS-7966 Commit: b00392dd9cbb6778f2f3e669e96cf7133590dfe7 Parents: c9cb6a5 Author: Wangda Tan <wan...@apache.org> Authored: Mon Sep 21 11:04:03 2015 -0700 Committer: Wangda Tan <wan...@apache.org> Committed: Mon Sep 21 11:04:03 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/yarn/client/RMProxy.java | 3 ++- .../src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java | 3 ++- 3 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b00392dd/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index a3dfb85..3ef5b75 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -865,6 +865,9 @@ Release 2.8.0 - UNRELEASED YARN-4167. NPE on RMActiveServices#serviceStop when store is null. (Bibin A Chundatt via rohithsharmaks) + YARN-4113. RM should respect retry-interval when uses RetryPolicies.RETRY_FOREVER. + (Sunil G via wangda) + Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/b00392dd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java index 28628f3..be08f2f 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java @@ -232,7 +232,8 @@ public class RMProxy<T> { RetryPolicy retryPolicy = null; if (waitForEver) { - retryPolicy = RetryPolicies.RETRY_FOREVER; + retryPolicy = RetryPolicies.retryForeverWithFixedSleep( + rmConnectionRetryIntervalMS, TimeUnit.MILLISECONDS); } else { retryPolicy = RetryPolicies.retryUpToMaximumTimeWithFixedSleep(rmConnectWaitMS, http://git-wip-us.apache.org/repos/asf/hadoop/blob/b00392dd/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java index de7fc7d..8c30fd7 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java @@ -63,7 +63,8 @@ public class ServerProxy { RetryPolicy retryPolicy = null; if (maxWaitTime == -1) { // wait forever. - retryPolicy = RetryPolicies.RETRY_FOREVER; + retryPolicy = RetryPolicies.retryForeverWithFixedSleep(retryIntervalMS, + TimeUnit.MILLISECONDS); } else { retryPolicy = RetryPolicies.retryUpToMaximumTimeWithFixedSleep(maxWaitTime,
