Repository: hadoop Updated Branches: refs/heads/branch-3.0.1 cb283982e -> cea25ac63
HADOOP-15212. Add independent secret manager method for logging expired tokens. Contributed by Daryn Sharp. (cherry picked from commit 2dd960de983a30bf0d9ee957bdb09f825f9d40a3) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cea25ac6 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cea25ac6 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cea25ac6 Branch: refs/heads/branch-3.0.1 Commit: cea25ac63a920ad6c3b6bd7003733d42b92e6f88 Parents: cb28398 Author: Kihwal Lee <kih...@apache.org> Authored: Tue Feb 6 15:35:56 2018 -0600 Committer: Kihwal Lee <kih...@apache.org> Committed: Tue Feb 6 15:35:56 2018 -0600 ---------------------------------------------------------------------- .../token/delegation/AbstractDelegationTokenSecretManager.java | 6 ++++++ 1 file changed, 6 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cea25ac6/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java index f06681b..7593b4e 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/AbstractDelegationTokenSecretManager.java @@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; import java.security.MessageDigest; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -627,6 +628,11 @@ extends AbstractDelegationTokenIdentifier> } } // don't hold lock on 'this' to avoid edit log updates blocking token ops + logExpireTokens(expiredTokens); + } + + protected void logExpireTokens( + Collection<TokenIdent> expiredTokens) throws IOException { for (TokenIdent ident : expiredTokens) { logExpireToken(ident); LOG.info("Removing expired token " + formatTokenId(ident)); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
