YARN-3857: Memory leak in ResourceManager with SIMPLE mode. Contributed by mujunchao.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3a76a010 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3a76a010 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3a76a010 Branch: refs/heads/HDFS-7240 Commit: 3a76a010b85176f2bcb85ed6f74c25dcb8acfe4d Parents: fc509f6 Author: Zhihai Xu <z...@apache.org> Authored: Tue Aug 18 10:36:40 2015 -0700 Committer: Zhihai Xu <z...@apache.org> Committed: Tue Aug 18 10:36:40 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 5 ++- .../rmapp/attempt/RMAppAttemptImpl.java | 8 +++-- .../ClientToAMTokenSecretManagerInRM.java | 7 +++++ .../attempt/TestRMAppAttemptTransitions.java | 32 ++++++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a76a010/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 66978a0..d900617 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -827,7 +827,10 @@ Release 2.7.2 - UNRELEASED YARN-3999. RM hangs on draing events. (Jian He via xgong) -Release 2.7.1 - 2015-07-06 + YARN-3857: Memory leak in ResourceManager with SIMPLE mode. + (mujunchao via zxu) + +Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a76a010/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java index 80f5eb0..74a4000 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/RMAppAttemptImpl.java @@ -1309,9 +1309,11 @@ public class RMAppAttemptImpl implements RMAppAttempt, Recoverable { // register the ClientTokenMasterKey after it is saved in the store, // otherwise client may hold an invalid ClientToken after RM restarts. - appAttempt.rmContext.getClientToAMTokenSecretManager() - .registerApplication(appAttempt.getAppAttemptId(), - appAttempt.getClientTokenMasterKey()); + if (UserGroupInformation.isSecurityEnabled()) { + appAttempt.rmContext.getClientToAMTokenSecretManager() + .registerApplication(appAttempt.getAppAttemptId(), + appAttempt.getClientTokenMasterKey()); + } } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a76a010/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ClientToAMTokenSecretManagerInRM.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ClientToAMTokenSecretManagerInRM.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ClientToAMTokenSecretManagerInRM.java index 4fbe2ce..4047bd5 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ClientToAMTokenSecretManagerInRM.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/ClientToAMTokenSecretManagerInRM.java @@ -22,6 +22,7 @@ import java.util.HashMap; import java.util.Map; import javax.crypto.SecretKey; +import com.google.common.annotations.VisibleForTesting; import org.apache.hadoop.yarn.api.records.ApplicationAttemptId; import org.apache.hadoop.yarn.security.client.BaseClientToAMTokenSecretManager; @@ -61,4 +62,10 @@ public class ClientToAMTokenSecretManagerInRM extends ApplicationAttemptId applicationAttemptID) { return this.masterKeys.get(applicationAttemptID); } + + @VisibleForTesting + public synchronized boolean hasMasterKey( + ApplicationAttemptId applicationAttemptID) { + return this.masterKeys.containsKey(applicationAttemptID); + } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/3a76a010/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.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/rmapp/attempt/TestRMAppAttemptTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java index 9afb5a9..c8b6bd0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/rmapp/attempt/TestRMAppAttemptTransitions.java @@ -1393,6 +1393,38 @@ public class TestRMAppAttemptTransitions { Assert.assertNull(token); } + // this is to test master key is saved in the secret manager only after + // attempt is launched and in secure-mode + @Test + public void testApplicationAttemptMasterKey() throws Exception { + Container amContainer = allocateApplicationAttempt(); + ApplicationAttemptId appid = applicationAttempt.getAppAttemptId(); + boolean isMasterKeyExisted = false; + + // before attempt is launched, can not get MasterKey + isMasterKeyExisted = clientToAMTokenManager.hasMasterKey(appid); + Assert.assertFalse(isMasterKeyExisted); + + launchApplicationAttempt(amContainer); + // after attempt is launched and in secure mode, can get MasterKey + isMasterKeyExisted = clientToAMTokenManager.hasMasterKey(appid); + if (isSecurityEnabled) { + Assert.assertTrue(isMasterKeyExisted); + Assert.assertNotNull(clientToAMTokenManager.getMasterKey(appid)); + } else { + Assert.assertFalse(isMasterKeyExisted); + } + + applicationAttempt.handle(new RMAppAttemptEvent(applicationAttempt + .getAppAttemptId(), RMAppAttemptEventType.KILL)); + assertEquals(YarnApplicationAttemptState.LAUNCHED, + applicationAttempt.createApplicationAttemptState()); + sendAttemptUpdateSavedEvent(applicationAttempt); + // after attempt is killed, can not get MasterKey + isMasterKeyExisted = clientToAMTokenManager.hasMasterKey(appid); + Assert.assertFalse(isMasterKeyExisted); + } + @Test public void testFailedToFailed() { // create a failed attempt.
