Repository: hadoop Updated Branches: refs/heads/branch-2 a82708990 -> 354d2c75c
YARN-2429. TestAMRMTokens.testTokenExpiry fails Intermittently with error message:Invalid AMRMToken (zxu via rkanter) (cherry picked from commit 99b08a748e7b00a58b63330b353902a6da6aae27) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/354d2c75 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/354d2c75 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/354d2c75 Branch: refs/heads/branch-2 Commit: 354d2c75cf8f48f47c5e1226ae4879952b0e3485 Parents: a827089 Author: Robert Kanter <rkan...@apache.org> Authored: Mon Apr 6 14:11:20 2015 -0700 Committer: Robert Kanter <rkan...@apache.org> Committed: Mon Apr 6 14:11:50 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/resourcemanager/security/TestAMRMTokens.java | 6 ++++++ 2 files changed, 9 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/354d2c75/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e9d9a37..7e6e7a4 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -100,6 +100,9 @@ Release 2.8.0 - UNRELEASED YARN-2666. TestFairScheduler.testContinuousScheduling fails Intermittently. (Zhihai Xu via ozawa) + YARN-2429. TestAMRMTokens.testTokenExpiry fails Intermittently with + error message:Invalid AMRMToken (zxu via rkanter) + Release 2.7.0 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/354d2c75/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java index 0be72e3..5dfd092 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestAMRMTokens.java @@ -107,6 +107,12 @@ public class TestAMRMTokens { @SuppressWarnings("unchecked") @Test public void testTokenExpiry() throws Exception { + conf.setLong( + YarnConfiguration.RM_AMRM_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS, + YarnConfiguration. + DEFAULT_RM_AMRM_TOKEN_MASTER_KEY_ROLLING_INTERVAL_SECS); + conf.setLong(YarnConfiguration.RM_AM_EXPIRY_INTERVAL_MS, + YarnConfiguration.DEFAULT_RM_AM_EXPIRY_INTERVAL_MS); MyContainerManager containerManager = new MyContainerManager(); final MockRMWithAMS rm =
