YARN-3058. Fix error message of tokens' activation delay configuration. Contributed by Yi Liu.
(cherry picked from commit 26dee1486b
)
This commit is contained in:
parent
3ab3caa9ea
commit
cdd76d5922
|
@ -439,6 +439,9 @@ Release 2.7.0 - UNRELEASED
|
|||
YARN-2543. Made resource usage be published to the timeline server too.
|
||||
(Naganarasimha G R via zjshen)
|
||||
|
||||
YARN-3058. Fix error message of tokens' activation delay configuration.
|
||||
(Yi Liu via ozawa)
|
||||
|
||||
Release 2.6.0 - 2014-11-18
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -96,7 +96,7 @@ public class AMRMTokenSecretManager extends
|
|||
if (rollingInterval <= activationDelay * 2) {
|
||||
throw new IllegalArgumentException(
|
||||
YarnConfiguration.RM_AMRM_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS
|
||||
+ " should be more than 2 X "
|
||||
+ " should be more than 3 X "
|
||||
+ YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@ public class NMTokenSecretManagerInRM extends BaseNMTokenSecretManager {
|
|||
if (rollingInterval <= activationDelay * 2) {
|
||||
throw new IllegalArgumentException(
|
||||
YarnConfiguration.RM_NMTOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS
|
||||
+ " should be more than 2 X "
|
||||
+ " should be more than 3 X "
|
||||
+ YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS);
|
||||
}
|
||||
appAttemptToNodeKeyMap =
|
||||
|
|
|
@ -80,8 +80,8 @@ public class RMContainerTokenSecretManager extends
|
|||
if (rollingInterval <= activationDelay * 2) {
|
||||
throw new IllegalArgumentException(
|
||||
YarnConfiguration.RM_CONTAINER_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS
|
||||
+ " should be more than 2 X "
|
||||
+ YarnConfiguration.RM_CONTAINER_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS);
|
||||
+ " should be more than 3 X "
|
||||
+ YarnConfiguration.RM_NM_EXPIRY_INTERVAL_MS);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue