Repository: hadoop Updated Branches: refs/heads/branch-2 22caeb1c0 -> 4d9efaf3b
HADOOP-12659. Incorrect usage of config parameters in token manager of KMS. Contributed by Mingliang Liu. (cherry picked from commit f3427d3766d7101d0d1c37d6281918551d221ebe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4d9efaf3 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4d9efaf3 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4d9efaf3 Branch: refs/heads/branch-2 Commit: 4d9efaf3b0cf98ccf0aea245d58d379615ea10c9 Parents: 22caeb1 Author: Xiaoyu Yao <x...@apache.org> Authored: Thu Jan 21 13:51:58 2016 -0800 Committer: Xiaoyu Yao <x...@apache.org> Committed: Thu Jan 21 13:55:42 2016 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../token/delegation/ZKDelegationTokenSecretManager.java | 2 +- .../security/token/delegation/web/DelegationTokenManager.java | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d9efaf3/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index acfb64f..ac1ebff 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1006,6 +1006,9 @@ Release 2.8.0 - UNRELEASED HADOOP-7161. Remove unnecessary oro package from dependency management section. (Sean Busbey via aajisaka) + HADOOP-12659. Incorrect usage of config parameters in token manager of + KMS. (Mingliang Liu via xyao) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d9efaf3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java index da0e6ad..88b81b0 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/ZKDelegationTokenSecretManager.java @@ -141,7 +141,7 @@ public abstract class ZKDelegationTokenSecretManager<TokenIdent extends Abstract conf.getLong(DelegationTokenManager.MAX_LIFETIME, DelegationTokenManager.MAX_LIFETIME_DEFAULT) * 1000, conf.getLong(DelegationTokenManager.RENEW_INTERVAL, - DelegationTokenManager.RENEW_INTERVAL_DEFAULT * 1000), + DelegationTokenManager.RENEW_INTERVAL_DEFAULT) * 1000, conf.getLong(DelegationTokenManager.REMOVAL_SCAN_INTERVAL, DelegationTokenManager.REMOVAL_SCAN_INTERVAL_DEFAULT) * 1000); shutdownTimeout = conf.getLong(ZK_DTSM_ZK_SHUTDOWN_TIMEOUT, http://git-wip-us.apache.org/repos/asf/hadoop/blob/4d9efaf3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java index 5d86249..221b02a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/token/delegation/web/DelegationTokenManager.java @@ -68,8 +68,8 @@ public class DelegationTokenManager { super(conf.getLong(UPDATE_INTERVAL, UPDATE_INTERVAL_DEFAULT) * 1000, conf.getLong(MAX_LIFETIME, MAX_LIFETIME_DEFAULT) * 1000, conf.getLong(RENEW_INTERVAL, RENEW_INTERVAL_DEFAULT) * 1000, - conf.getLong(REMOVAL_SCAN_INTERVAL, - REMOVAL_SCAN_INTERVAL_DEFAULT * 1000)); + conf.getLong(REMOVAL_SCAN_INTERVAL, REMOVAL_SCAN_INTERVAL_DEFAULT) + * 1000); this.tokenKind = tokenKind; }
