YARN-3587. Fix the javadoc of DelegationTokenSecretManager in yarn, etc. projects. Contributed by Gabor Liptak.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7e543c27 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7e543c27 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7e543c27 Branch: refs/heads/HDFS-7240 Commit: 7e543c27fa2881aa65967be384a6203bd5b2304f Parents: 3fa2efc Author: Junping Du <[email protected]> Authored: Mon May 11 05:27:07 2015 -0700 Committer: Junping Du <[email protected]> Committed: Mon May 11 05:27:07 2015 -0700 ---------------------------------------------------------------------- .../AbstractDelegationTokenSecretManager.java | 11 +++++++++++ .../token/delegation/DelegationTokenSecretManager.java | 9 +++++---- .../token/delegation/DelegationTokenSecretManager.java | 9 +++++---- .../v2/hs/JHSDelegationTokenSecretManager.java | 9 +++++---- hadoop-yarn-project/CHANGES.txt | 3 +++ .../TimelineDelegationTokenSecretManagerService.java | 12 ++++++++---- .../security/RMDelegationTokenSecretManager.java | 10 ++++++---- 7 files changed, 43 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/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 52e6a01..1d7f2f5 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 @@ -99,6 +99,17 @@ extends AbstractDelegationTokenIdentifier> */ protected Object noInterruptsLock = new Object(); + /** + * Create a secret manager + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. + * @param delegationTokenMaxLifetime the maximum lifetime of the delegation + * tokens in milliseconds + * @param delegationTokenRenewInterval how often the tokens must be renewed + * in milliseconds + * @param delegationTokenRemoverScanInterval how often the tokens are scanned + * for expired tokens in milliseconds + */ public AbstractDelegationTokenSecretManager(long delegationKeyUpdateInterval, long delegationTokenMaxLifetime, long delegationTokenRenewInterval, long delegationTokenRemoverScanInterval) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java index 8af7eba..b7f89a8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/security/token/delegation/DelegationTokenSecretManager.java @@ -79,13 +79,14 @@ public class DelegationTokenSecretManager /** * Create a secret manager - * @param delegationKeyUpdateInterval the number of seconds for rolling new - * secret keys. + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. * @param delegationTokenMaxLifetime the maximum lifetime of the delegation - * tokens + * tokens in milliseconds * @param delegationTokenRenewInterval how often the tokens must be renewed + * in milliseconds * @param delegationTokenRemoverScanInterval how often the tokens are scanned - * for expired tokens + * for expired tokens in milliseconds * @param storeTokenTrackingId whether to store the token's tracking id */ public DelegationTokenSecretManager(long delegationKeyUpdateInterval, http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java index b42e0c9..2a109b6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java @@ -34,13 +34,14 @@ public class DelegationTokenSecretManager /** * Create a secret manager - * @param delegationKeyUpdateInterval the number of seconds for rolling new - * secret keys. + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. * @param delegationTokenMaxLifetime the maximum lifetime of the delegation - * tokens + * tokens in milliseconds * @param delegationTokenRenewInterval how often the tokens must be renewed + * in milliseconds * @param delegationTokenRemoverScanInterval how often the tokens are scanned - * for expired tokens + * for expired tokens in milliseconds */ public DelegationTokenSecretManager(long delegationKeyUpdateInterval, long delegationTokenMaxLifetime, http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JHSDelegationTokenSecretManager.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JHSDelegationTokenSecretManager.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JHSDelegationTokenSecretManager.java index 7fac44d..98d13a4 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JHSDelegationTokenSecretManager.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/main/java/org/apache/hadoop/mapreduce/v2/hs/JHSDelegationTokenSecretManager.java @@ -47,13 +47,14 @@ public class JHSDelegationTokenSecretManager /** * Create a secret manager - * @param delegationKeyUpdateInterval the number of seconds for rolling new - * secret keys. + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. * @param delegationTokenMaxLifetime the maximum lifetime of the delegation - * tokens + * tokens in milliseconds * @param delegationTokenRenewInterval how often the tokens must be renewed + * in milliseconds * @param delegationTokenRemoverScanInterval how often the tokens are scanned - * for expired tokens + * for expired tokens in milliseconds * @param store history server state store for persisting state */ public JHSDelegationTokenSecretManager(long delegationKeyUpdateInterval, http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 9791411..645b2a6 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -224,6 +224,9 @@ Release 2.8.0 - UNRELEASED YARN-3395. FairScheduler: Trim whitespaces when using username for queuename. (Zhihai Xu via kasha) + YARN-3587. Fix the javadoc of DelegationTokenSecretManager in yarn, etc. + projects. (Gabor Liptak via junping_du) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineDelegationTokenSecretManagerService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineDelegationTokenSecretManagerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineDelegationTokenSecretManagerService.java index c940eea..60a0348 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineDelegationTokenSecretManagerService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/timeline/security/TimelineDelegationTokenSecretManagerService.java @@ -125,11 +125,15 @@ public class TimelineDelegationTokenSecretManagerService extends /** * Create a timeline secret manager - * - * @param delegationKeyUpdateInterval the number of seconds for rolling new secret keys. - * @param delegationTokenMaxLifetime the maximum lifetime of the delegation tokens + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. + * @param delegationTokenMaxLifetime the maximum lifetime of the delegation + * tokens in milliseconds * @param delegationTokenRenewInterval how often the tokens must be renewed - * @param delegationTokenRemoverScanInterval how often the tokens are scanned for expired tokens + * in milliseconds + * @param delegationTokenRemoverScanInterval how often the tokens are + * scanned for expired tokens in milliseconds + * @param stateStore timeline service state store */ public TimelineDelegationTokenSecretManager( long delegationKeyUpdateInterval, http://git-wip-us.apache.org/repos/asf/hadoop/blob/7e543c27/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.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/RMDelegationTokenSecretManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java index 83defc5..631ca9d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/security/RMDelegationTokenSecretManager.java @@ -56,13 +56,15 @@ public class RMDelegationTokenSecretManager extends /** * Create a secret manager - * @param delegationKeyUpdateInterval the number of seconds for rolling new - * secret keys. + * @param delegationKeyUpdateInterval the number of milliseconds for rolling + * new secret keys. * @param delegationTokenMaxLifetime the maximum lifetime of the delegation - * tokens + * tokens in milliseconds * @param delegationTokenRenewInterval how often the tokens must be renewed + * in milliseconds * @param delegationTokenRemoverScanInterval how often the tokens are scanned - * for expired tokens + * for expired tokens in milliseconds + * @param rmContext current context of the ResourceManager */ public RMDelegationTokenSecretManager(long delegationKeyUpdateInterval, long delegationTokenMaxLifetime,
