You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2019/04/22 20:32:22 UTC
[hadoop] branch trunk updated: HDFS-14374. Expose total number of
delegation tokens in AbstractDelegationTokenSecretManager. Contributed by
CR Hota.
This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new fb1c549 HDFS-14374. Expose total number of delegation tokens in AbstractDelegationTokenSecretManager. Contributed by CR Hota.
fb1c549 is described below
commit fb1c5491398bbdac181e867022881fe2ff73c884
Author: Inigo Goiri <in...@apache.org>
AuthorDate: Mon Apr 22 13:31:20 2019 -0700
HDFS-14374. Expose total number of delegation tokens in AbstractDelegationTokenSecretManager. Contributed by CR Hota.
---
.../AbstractDelegationTokenSecretManager.java | 9 ++++++++-
.../token/delegation/TestDelegationToken.java | 23 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 1 deletion(-)
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 9259d87..f329acc 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
@@ -145,7 +145,14 @@ extends AbstractDelegationTokenIdentifier>
setDelegationTokenSeqNum(0);
currentTokens.clear();
}
-
+
+ /**
+ * Total count of active delegation tokens.
+ */
+ public long getCurrentTokensSize() {
+ return currentTokens.size();
+ }
+
/**
* Add a previously used master key to cache (when NN restarts),
* should be called before activate().
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
index ad12f0b..df685cf 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/security/token/delegation/TestDelegationToken.java
@@ -260,6 +260,29 @@ public class TestDelegationToken {
}
@Test
+ public void testDelegationTokenCount() throws Exception {
+ final TestDelegationTokenSecretManager dtSecretManager =
+ new TestDelegationTokenSecretManager(24*60*60*1000,
+ 3*1000, 1*1000, 3600000);
+ try {
+ dtSecretManager.startThreads();
+ Assert.assertEquals(dtSecretManager.getCurrentTokensSize(), 0);
+ final Token<TestDelegationTokenIdentifier> token1 =
+ generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker");
+ Assert.assertEquals(dtSecretManager.getCurrentTokensSize(), 1);
+ final Token<TestDelegationTokenIdentifier> token2 =
+ generateDelegationToken(dtSecretManager, "SomeUser", "JobTracker");
+ Assert.assertEquals(dtSecretManager.getCurrentTokensSize(), 2);
+ dtSecretManager.cancelToken(token1, "JobTracker");
+ Assert.assertEquals(dtSecretManager.getCurrentTokensSize(), 1);
+ dtSecretManager.cancelToken(token2, "JobTracker");
+ Assert.assertEquals(dtSecretManager.getCurrentTokensSize(), 0);
+ } finally {
+ dtSecretManager.stopThreads();
+ }
+ }
+
+ @Test
public void testDelegationTokenSecretManager() throws Exception {
final TestDelegationTokenSecretManager dtSecretManager =
new TestDelegationTokenSecretManager(24*60*60*1000,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org