diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java index 141a9c6..9b66141 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/ResourceManager.java @@ -84,12 +84,8 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEvent; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType; -import org.apache.hadoop.yarn.server.resourcemanager.security.AMRMTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.security.DelegationTokenRenewer; -import org.apache.hadoop.yarn.server.resourcemanager.security.NMTokenSecretManagerInRM; import org.apache.hadoop.yarn.server.resourcemanager.security.QueueACLsManager; -import org.apache.hadoop.yarn.server.resourcemanager.security.RMContainerTokenSecretManager; -import org.apache.hadoop.yarn.server.resourcemanager.security.RMDelegationTokenSecretManager; import org.apache.hadoop.yarn.server.resourcemanager.webapp.RMWebApp; import org.apache.hadoop.yarn.server.security.ApplicationACLsManager; import org.apache.hadoop.yarn.server.webproxy.AppReportFetcher; @@ -936,7 +932,7 @@ protected ResourceTrackerService createResourceTrackerService() { protected ClientRMService createClientRMService() { return new ClientRMService(this.rmContext, scheduler, this.rmAppManager, this.applicationACLsManager, this.queueACLsManager, - getRMDTSecretManager()); + this.rmContext.getRMDelegationTokenSecretManager()); } protected ApplicationMasterService createApplicationMasterService() { @@ -989,30 +985,10 @@ public QueueACLsManager getQueueACLsManager() { return this.queueACLsManager; } - @Private - public RMContainerTokenSecretManager getRMContainerTokenSecretManager() { - return this.rmContext.getContainerTokenSecretManager(); - } - - @Private - public NMTokenSecretManagerInRM getRMNMTokenSecretManager() { - return this.rmContext.getNMTokenSecretManager(); - } - - @Private - public AMRMTokenSecretManager getAMRMTokenSecretManager(){ - return this.rmContext.getAMRMTokenSecretManager(); - } - - @Private - public RMDelegationTokenSecretManager getRMDTSecretManager(){ - return this.rmContext.getRMDelegationTokenSecretManager(); - } - @Override public void recover(RMState state) throws Exception { // recover RMdelegationTokenSecretManager - getRMDTSecretManager().recover(state); + rmContext.getRMDelegationTokenSecretManager().recover(state); // recover applications rmAppManager.recover(state); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java index 1f3b80c..fcec4e9 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/MockRM.java @@ -386,7 +386,7 @@ public void sendAMLaunchFailed(ApplicationAttemptId appAttemptId) protected ClientRMService createClientRMService() { return new ClientRMService(getRMContext(), getResourceScheduler(), rmAppManager, applicationACLsManager, queueACLsManager, - getRMDTSecretManager()) { + getRMContext().getRMDelegationTokenSecretManager()) { @Override protected void serviceStart() { // override to not start rpc handler @@ -404,10 +404,10 @@ protected ResourceTrackerService createResourceTrackerService() { Configuration conf = new Configuration(); RMContainerTokenSecretManager containerTokenSecretManager = - getRMContainerTokenSecretManager(); + getRMContext().getContainerTokenSecretManager(); containerTokenSecretManager.rollMasterKey(); NMTokenSecretManagerInRM nmTokenSecretManager = - getRMNMTokenSecretManager(); + getRMContext().getNMTokenSecretManager(); nmTokenSecretManager.rollMasterKey(); return new ResourceTrackerService(getRMContext(), nodesListManager, this.nmLivelinessMonitor, containerTokenSecretManager, diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/QueueACLsTestBase.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/QueueACLsTestBase.java index b400e4f..e12eaaa 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/QueueACLsTestBase.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/QueueACLsTestBase.java @@ -86,7 +86,7 @@ public void setup() throws InterruptedException, IOException { protected ClientRMService createClientRMService() { return new ClientRMService(getRMContext(), this.scheduler, this.rmAppManager, this.applicationACLsManager, - this.queueACLsManager, getRMDTSecretManager()); + this.queueACLsManager, getRMContext().getRMDelegationTokenSecretManager()); }; @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 4bf8932..118f925 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -159,7 +159,7 @@ public void testGetClusterNodes() throws Exception { protected ClientRMService createClientRMService() { return new ClientRMService(this.rmContext, scheduler, this.rmAppManager, this.applicationACLsManager, this.queueACLsManager, - this.getRMDTSecretManager()); + this.getRMContext().getRMDelegationTokenSecretManager()); }; }; rm.start(); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java index 13d29ac..149ddf5 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestKillApplicationWithRMHA.java @@ -195,7 +195,7 @@ private void startRMsWithCustomizedClientRMService() throws IOException { protected ClientRMService createClientRMService() { return new MyClientRMService(this.rmContext, this.scheduler, this.rmAppManager, this.applicationACLsManager, - this.queueACLsManager, getRMDTSecretManager()); + this.queueACLsManager, getRMContext().getRMDelegationTokenSecretManager()); } }; diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java index 1b60fce..75fd476 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestMoveApplication.java @@ -53,8 +53,8 @@ public void setUp() throws Exception { conf.setBoolean(YarnConfiguration.YARN_ACL_ENABLE, true); resourceManager = new ResourceManager(); resourceManager.init(conf); - resourceManager.getRMContainerTokenSecretManager().rollMasterKey(); - resourceManager.getRMNMTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getContainerTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getNMTokenSecretManager().rollMasterKey(); resourceManager.start(); failMove = false; } diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java index 9bedb34..bf85a80 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMRestart.java @@ -1101,7 +1101,7 @@ public void testDelegationTokenRestoredInDelegationTokenRenewer() userText1); Token token1 = new Token(dtId1, - rm1.getRMDTSecretManager()); + rm1.getRMContext().getRMDelegationTokenSecretManager()); SecurityUtil.setTokenService(token1, rmAddr); ts.addToken(userText1, token1); tokenSet.add(token1); @@ -1112,7 +1112,7 @@ public void testDelegationTokenRestoredInDelegationTokenRenewer() userText2); Token token2 = new Token(dtId2, - rm1.getRMDTSecretManager()); + rm1.getRMContext().getRMDelegationTokenSecretManager()); SecurityUtil.setTokenService(token2, rmAddr); ts.addToken(userText2, token2); tokenSet.add(token2); @@ -1255,7 +1255,7 @@ public void testAppAttemptTokensRestoredOnRMRestart() throws Exception { // assert AMRMTokenSecretManager also knows about the AMRMToken password Token amrmToken = loadedAttempt1.getAMRMToken(); Assert.assertArrayEquals(amrmToken.getPassword(), - rm2.getAMRMTokenSecretManager().retrievePassword( + rm2.getRMContext().getAMRMTokenSecretManager().retrievePassword( amrmToken.decodeIdentifier())); rm1.stop(); rm2.stop(); @@ -1314,19 +1314,20 @@ public void testRMDelegationTokenRestoredOnRMRestart() throws Exception { Assert.assertNotNull(appState); // assert all master keys are saved - Set allKeysRM1 = rm1.getRMDTSecretManager().getAllMasterKeys(); + Set allKeysRM1 = rm1.getRMContext() + .getRMDelegationTokenSecretManager().getAllMasterKeys(); Assert.assertEquals(allKeysRM1, rmDTMasterKeyState); // assert all tokens are saved Map allTokensRM1 = - rm1.getRMDTSecretManager().getAllTokens(); + rm1.getRMContext().getRMDelegationTokenSecretManager().getAllTokens(); Assert.assertEquals(tokenIdentSet, allTokensRM1.keySet()); Assert.assertEquals(allTokensRM1, rmDTState); // assert sequence number is saved - Assert.assertEquals( - rm1.getRMDTSecretManager().getLatestDTSequenceNumber(), - rmState.getRMDTSecretManagerState().getDTSequenceNumber()); + Assert.assertEquals(rm1.getRMContext().getRMDelegationTokenSecretManager() + .getLatestDTSequenceNumber(), rmState.getRMDTSecretManagerState() + .getDTSequenceNumber()); // request one more token GetDelegationTokenRequest request2 = @@ -1341,16 +1342,15 @@ public void testRMDelegationTokenRestoredOnRMRestart() throws Exception { // cancel token2 try{ - rm1.getRMDTSecretManager().cancelToken(token2, + rm1.getRMContext().getRMDelegationTokenSecretManager().cancelToken(token2, UserGroupInformation.getCurrentUser().getUserName()); } catch(Exception e) { Assert.fail(); } // Assert the token which has the latest delegationTokenSequenceNumber is removed - Assert.assertEquals( - rm1.getRMDTSecretManager().getLatestDTSequenceNumber(), - dtId2.getSequenceNumber()); + Assert.assertEquals(rm1.getRMContext().getRMDelegationTokenSecretManager() + .getLatestDTSequenceNumber(), dtId2.getSequenceNumber()); Assert.assertFalse(rmDTState.containsKey(dtId2)); // start new RM @@ -1359,16 +1359,17 @@ public void testRMDelegationTokenRestoredOnRMRestart() throws Exception { // assert master keys and tokens are populated back to DTSecretManager Map allTokensRM2 = - rm2.getRMDTSecretManager().getAllTokens(); + rm2.getRMContext().getRMDelegationTokenSecretManager().getAllTokens(); Assert.assertEquals(allTokensRM2.keySet(), allTokensRM1.keySet()); // rm2 has its own master keys when it starts, we use containsAll here - Assert.assertTrue(rm2.getRMDTSecretManager().getAllMasterKeys() - .containsAll(allKeysRM1)); + Assert.assertTrue(rm2.getRMContext().getRMDelegationTokenSecretManager() + .getAllMasterKeys().containsAll(allKeysRM1)); // assert sequenceNumber is properly recovered, // even though the token which has max sequenceNumber is not stored - Assert.assertEquals(rm1.getRMDTSecretManager().getLatestDTSequenceNumber(), - rm2.getRMDTSecretManager().getLatestDTSequenceNumber()); + Assert.assertEquals(rm1.getRMContext().getRMDelegationTokenSecretManager() + .getLatestDTSequenceNumber(), rm2.getRMContext() + .getRMDelegationTokenSecretManager().getLatestDTSequenceNumber()); // renewDate before renewing Long renewDateBeforeRenew = allTokensRM2.get(dtId1); @@ -1376,12 +1377,14 @@ public void testRMDelegationTokenRestoredOnRMRestart() throws Exception { // Sleep for one millisecond to make sure renewDataAfterRenew is greater Thread.sleep(1); // renew recovered token - rm2.getRMDTSecretManager().renewToken(token1, "renewer1"); + rm2.getRMContext().getRMDelegationTokenSecretManager().renewToken( + token1, "renewer1"); } catch(Exception e) { Assert.fail(); } - allTokensRM2 = rm2.getRMDTSecretManager().getAllTokens(); + allTokensRM2 = rm2.getRMContext().getRMDelegationTokenSecretManager() + .getAllTokens(); Long renewDateAfterRenew = allTokensRM2.get(dtId1); // assert token is renewed Assert.assertTrue(renewDateAfterRenew > renewDateBeforeRenew); @@ -1392,14 +1395,15 @@ public void testRMDelegationTokenRestoredOnRMRestart() throws Exception { Assert.assertFalse(rmDTState.containsValue(renewDateBeforeRenew)); try{ - rm2.getRMDTSecretManager().cancelToken(token1, + rm2.getRMContext().getRMDelegationTokenSecretManager().cancelToken(token1, UserGroupInformation.getCurrentUser().getUserName()); } catch(Exception e) { Assert.fail(); } // assert token is removed from state after its cancelled - allTokensRM2 = rm2.getRMDTSecretManager().getAllTokens(); + allTokensRM2 = rm2.getRMContext().getRMDelegationTokenSecretManager() + .getAllTokens(); Assert.assertFalse(allTokensRM2.containsKey(dtId1)); Assert.assertFalse(rmDTState.containsKey(dtId1)); @@ -1875,7 +1879,8 @@ public TestSecurityMockRM(Configuration conf, RMStateStore store) { @Override protected ClientRMService createClientRMService() { return new ClientRMService(getRMContext(), getResourceScheduler(), - rmAppManager, applicationACLsManager, null, getRMDTSecretManager()){ + rmAppManager, applicationACLsManager, null, + getRMContext().getRMDelegationTokenSecretManager()){ @Override protected void serviceStart() throws Exception { // do nothing diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java index 3a113c9..4fdfcf6 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestResourceManager.java @@ -54,8 +54,8 @@ public void setUp() throws Exception { Configuration conf = new YarnConfiguration(); resourceManager = new ResourceManager(); resourceManager.init(conf); - resourceManager.getRMContainerTokenSecretManager().rollMasterKey(); - resourceManager.getRMNMTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getContainerTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getNMTokenSecretManager().rollMasterKey(); } @After diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java index 47ec546..fd922fd 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestCapacityScheduler.java @@ -117,8 +117,8 @@ public void setUp() throws Exception { conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class, ResourceScheduler.class); resourceManager.init(conf); - resourceManager.getRMContainerTokenSecretManager().rollMasterKey(); - resourceManager.getRMNMTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getContainerTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getNMTokenSecretManager().rollMasterKey(); ((AsyncDispatcher)resourceManager.getRMContext().getDispatcher()).start(); mockContext = mock(RMContext.class); when(mockContext.getConfigurationProvider()).thenReturn( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java index d1052bb..d178949 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java @@ -149,7 +149,7 @@ public void setUp() throws IOException { resourceManager.getRMContext().getStateStore().start(); // to initialize the master key - resourceManager.getRMContainerTokenSecretManager().rollMasterKey(); + resourceManager.getRMContext().getContainerTokenSecretManager().rollMasterKey(); } @After diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java index 6a209e7..eabe9bc 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestClientToAMTokens.java @@ -168,7 +168,7 @@ public void testClientToAMTokens() throws Exception { protected ClientRMService createClientRMService() { return new ClientRMService(this.rmContext, scheduler, this.rmAppManager, this.applicationACLsManager, this.queueACLsManager, - getRMDTSecretManager()); + getRMContext().getRMDelegationTokenSecretManager()); }; @Override diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java 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 5a23322..cf11e48 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/security/TestRMDelegationTokens.java @@ -85,7 +85,8 @@ public void testRMDTMasterKeyStateOnRollingMasterKey() throws Exception { // the other is created on the first run of // tokenRemoverThread.rollMasterKey() - RMDelegationTokenSecretManager dtSecretManager = rm1.getRMDTSecretManager(); + RMDelegationTokenSecretManager dtSecretManager = + rm1.getRMContext().getRMDelegationTokenSecretManager(); // assert all master keys are saved Assert.assertEquals(dtSecretManager.getAllMasterKeys(), rmDTMasterKeyState); Set expiringKeys = new HashSet(); @@ -140,7 +141,8 @@ public void testRemoveExpiredMasterKeyInRMStateStore() throws Exception { MockRM rm1 = new MyMockRM(conf, memStore); rm1.start(); - RMDelegationTokenSecretManager dtSecretManager = rm1.getRMDTSecretManager(); + RMDelegationTokenSecretManager dtSecretManager = + rm1.getRMContext().getRMDelegationTokenSecretManager(); // assert all master keys are saved Assert.assertEquals(dtSecretManager.getAllMasterKeys(), rmDTMasterKeyState); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java index b26c37f..da2e2b1 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesNodes.java @@ -81,8 +81,8 @@ protected void configureServlets() { bind(RMWebServices.class); bind(GenericExceptionHandler.class); rm = new MockRM(new Configuration()); - rm.getRMContainerTokenSecretManager().rollMasterKey(); - rm.getRMNMTokenSecretManager().rollMasterKey(); + rm.getRMContext().getContainerTokenSecretManager().rollMasterKey(); + rm.getRMContext().getNMTokenSecretManager().rollMasterKey(); bind(ResourceManager.class).toInstance(rm); bind(RMContext.class).toInstance(rm.getRMContext()); bind(ApplicationACLsManager.class).toInstance( diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java index 34582a7..4d062a4 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestContainerManagerSecurity.java @@ -164,7 +164,7 @@ private void testNMTokens(Configuration conf) throws Exception { NMTokenSecretManagerInNM nmTokenSecretManagerNM = yarnCluster.getNodeManager(0).getNMContext().getNMTokenSecretManager(); RMContainerTokenSecretManager containerTokenSecretManager = - yarnCluster.getResourceManager().getRMContainerTokenSecretManager(); + yarnCluster.getResourceManager().getRMContext().getContainerTokenSecretManager(); NodeManager nm = yarnCluster.getNodeManager(0); @@ -573,7 +573,7 @@ private void testContainerToken(Configuration conf) throws IOException, // Creating a tampered Container Token RMContainerTokenSecretManager containerTokenSecretManager = - yarnCluster.getResourceManager().getRMContainerTokenSecretManager(); + yarnCluster.getResourceManager().getRMContext().getContainerTokenSecretManager(); RMContainerTokenSecretManager tamperedContainerTokenSecretManager = new RMContainerTokenSecretManager(conf); diff --git hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java index dbeb49d..df781c7 100644 --- hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java +++ hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/TestRMNMSecretKeys.java @@ -109,8 +109,8 @@ protected void startWepApp() { dispatcher.await(); // Let's force a roll-over - rm.getRMContainerTokenSecretManager().rollMasterKey(); - rm.getRMNMTokenSecretManager().rollMasterKey(); + rm.getRMContext().getContainerTokenSecretManager().rollMasterKey(); + rm.getRMContext().getNMTokenSecretManager().rollMasterKey(); // Heartbeats after roll-over and before activation should be fine. response = nm.nodeHeartbeat(true); @@ -141,8 +141,8 @@ protected void startWepApp() { dispatcher.await(); // Let's force activation - rm.getRMContainerTokenSecretManager().activateNextMasterKey(); - rm.getRMNMTokenSecretManager().activateNextMasterKey(); + rm.getRMContext().getContainerTokenSecretManager().activateNextMasterKey(); + rm.getRMContext().getNMTokenSecretManager().activateNextMasterKey(); response = nm.nodeHeartbeat(true); Assert.assertNull(containerToken