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

YARN-4113. RM should respect retry-interval when uses RetryPolicies.RETRY_FOREVER. (Sunil G via wangda) 

(cherry picked from commit b00392dd9c)
This commit is contained in:
Wangda Tan 2015-09-21 11:04:03 -07:00
parent 52f343598e
commit fafcb4ac4e
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -813,6 +813,9 @@ Release 2.8.0 - UNRELEASED
YARN-4167. NPE on RMActiveServices#serviceStop when store is null. (Bibin A Chundatt via rohithsharmaks) 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 Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/RMProxy.java
View File

@ -232,7 +232,8 @@ public class RMProxy<T> {
RetryPolicy retryPolicy = null; RetryPolicy retryPolicy = null;
if (waitForEver) { if (waitForEver) {
retryPolicy = RetryPolicies.RETRY_FOREVER; retryPolicy = RetryPolicies.retryForeverWithFixedSleep(
rmConnectionRetryIntervalMS, TimeUnit.MILLISECONDS);
} else { } else {
retryPolicy = retryPolicy =
RetryPolicies.retryUpToMaximumTimeWithFixedSleep(rmConnectWaitMS, RetryPolicies.retryUpToMaximumTimeWithFixedSleep(rmConnectWaitMS,

3
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/client/ServerProxy.java
View File

@ -63,7 +63,8 @@ public class ServerProxy {
RetryPolicy retryPolicy = null; RetryPolicy retryPolicy = null;
if (maxWaitTime == -1) { if (maxWaitTime == -1) {
// wait forever. // wait forever.
retryPolicy = RetryPolicies.RETRY_FOREVER; retryPolicy = RetryPolicies.retryForeverWithFixedSleep(retryIntervalMS,
TimeUnit.MILLISECONDS);
} else { } else {
retryPolicy = retryPolicy =
RetryPolicies.retryUpToMaximumTimeWithFixedSleep(maxWaitTime, RetryPolicies.retryUpToMaximumTimeWithFixedSleep(maxWaitTime,