From 657dd59cc840bce3426170baf68f9d46842f4f53 Mon Sep 17 00:00:00 2001 From: Jason Lowe Date: Tue, 22 Aug 2017 13:16:24 -0500 Subject: [PATCH] YARN-7048. Fix tests faking kerberos to explicitly set ugi auth type. Contributed by Daryn Sharp --- .../yarn/server/resourcemanager/TestTokenClientRMService.java | 3 +++ .../resourcemanager/security/TestRMDelegationTokens.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java index 2a4e49d910e..78271c65482 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestTokenClientRMService.java @@ -28,6 +28,7 @@ import org.apache.hadoop.io.Text; import org.apache.hadoop.security.SaslRpcServer.AuthMethod; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod; import org.apache.hadoop.security.authentication.util.KerberosName; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.yarn.api.protocolrecords.CancelDelegationTokenRequest; @@ -80,6 +81,8 @@ public static void setupSecretManager() throws IOException { conf.set("hadoop.security.authentication", "kerberos"); conf.set("hadoop.security.auth_to_local", kerberosRule); UserGroupInformation.setConfiguration(conf); + UserGroupInformation.getLoginUser() + .setAuthenticationMethod(AuthenticationMethod.KERBEROS); } @AfterClass 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 06c642afeff..640293c3fc3 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 @@ -29,6 +29,7 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.UserGroupInformation; +import org.apache.hadoop.security.UserGroupInformation.AuthenticationMethod; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.delegation.DelegationKey; import org.apache.hadoop.util.ExitUtil; @@ -74,6 +75,9 @@ public void testRMDTMasterKeyStateOnRollingMasterKey() throws Exception { Configuration conf = new Configuration(testConf); conf.set("hadoop.security.authentication", "kerberos"); UserGroupInformation.setConfiguration(conf); + UserGroupInformation.getLoginUser() + .setAuthenticationMethod(AuthenticationMethod.KERBEROS); + MemoryRMStateStore memStore = new MockRMMemoryStateStore(); memStore.init(conf); RMState rmState = memStore.getState();