Repository: hadoop Updated Branches: refs/heads/branch-3.2 660fff313 -> 709775592
YARN-8904. TestRMDelegationTokens can fail in testRMDTMasterKeyStateOnRollingMasterKey. Contributed by Wilfred Spiegelenburg (cherry picked from commit 93fb3b4b9cbc63e65d590676a5a318d555a25904) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/70977559 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/70977559 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/70977559 Branch: refs/heads/branch-3.2 Commit: 709775592579543aa1e20a0e5d176894da93cc85 Parents: 660fff3 Author: Jason Lowe <[email protected]> Authored: Tue Oct 23 12:49:15 2018 -0500 Committer: Jason Lowe <[email protected]> Committed: Tue Oct 23 12:54:04 2018 -0500 ---------------------------------------------------------------------- .../security/TestRMDelegationTokens.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/70977559/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.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/TestRMDelegationTokens.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java index 2c52377..aae86b0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java @@ -97,7 +97,17 @@ public class TestRMDelegationTokens { RMDelegationTokenSecretManager dtSecretManager = rm1.getRMContext().getRMDelegationTokenSecretManager(); // assert all master keys are saved - Assert.assertEquals(dtSecretManager.getAllMasterKeys(), rmDTMasterKeyState); + dtSecretManager.getAllMasterKeys().forEach(managerKey -> { + int keyId = managerKey.getKeyId(); + boolean found = false; + for (DelegationKey stateKey: rmDTMasterKeyState) { + if (stateKey.getKeyId() == keyId) { + found = true; + break; + } + } + Assert.assertTrue("Master key not found: " + keyId, found); + }); // request to generate a RMDelegationToken GetDelegationTokenRequest request = mock(GetDelegationTokenRequest.class); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
