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 br...@apache.org on 2018/11/13 07:43:45 UTC
[1/4] hadoop git commit: HDFS-14070. Refactor NameNodeWebHdfsMethods
to allow better extensibility. Contributed by CR Hota
Repository: hadoop
Updated Branches:
refs/heads/branch-3.0 ff1cbb48c -> 04bba9158
refs/heads/branch-3.1 1959ca6f2 -> d72c13488
refs/heads/branch-3.2 359b1dd40 -> 5e8664126
refs/heads/trunk a67642c37 -> e7b63baca
HDFS-14070. Refactor NameNodeWebHdfsMethods to allow better extensibility. Contributed by CR Hota
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7b63bac
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7b63bac
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7b63bac
Branch: refs/heads/trunk
Commit: e7b63baca1e10b28d8b4462fd80537b871951aa3
Parents: a67642c
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Nov 13 12:45:13 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Nov 13 12:45:44 2018 +0530
----------------------------------------------------------------------
.../web/resources/NamenodeWebHdfsMethods.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7b63bac/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
index d73fd45..c4d3239 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
@@ -337,9 +337,22 @@ public class NamenodeWebHdfsMethods {
throw new IOException("No active nodes contain this block");
}
- private Token<? extends TokenIdentifier> generateDelegationToken(
- final NameNode namenode, final UserGroupInformation ugi,
+ public long renewDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ return cp.renewDelegationToken(token);
+ }
+
+ public void cancelDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ cp.cancelDelegationToken(token);
+ }
+
+ public Token<? extends TokenIdentifier> generateDelegationToken(
+ final UserGroupInformation ugi,
final String renewer) throws IOException {
+ final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Credentials c = DelegationTokenSecretManager.createCredentials(
namenode, ugi, renewer != null? renewer: ugi.getShortUserName());
if (c == null) {
@@ -384,7 +397,7 @@ public class NamenodeWebHdfsMethods {
} else {
//generate a token
final Token<? extends TokenIdentifier> t = generateDelegationToken(
- namenode, ugi, null);
+ ugi, null);
delegationQuery = "&" + new DelegationParam(t.encodeToUrlString());
}
@@ -705,7 +718,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- final long expiryTime = cp.renewDelegationToken(token);
+ final long expiryTime = renewDelegationToken(token);
final String js = JsonUtil.toJsonString("long", expiryTime);
return Response.ok(js).type(MediaType.APPLICATION_JSON).build();
}
@@ -714,7 +727,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- cp.cancelDelegationToken(token);
+ cancelDelegationToken(token);
return Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).build();
}
case MODIFYACLENTRIES: {
@@ -1138,9 +1151,8 @@ public class NamenodeWebHdfsMethods {
throw new IllegalArgumentException(delegation.getName()
+ " parameter is not null.");
}
- final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Token<? extends TokenIdentifier> token = generateDelegationToken(
- namenode, ugi, renewer.getValue());
+ ugi, renewer.getValue());
final String setServiceName = tokenService.getValue();
final String setKind = tokenKind.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/4] hadoop git commit: HDFS-14070. Refactor NameNodeWebHdfsMethods
to allow better extensibility. Contributed by CR Hota
Posted by br...@apache.org.
HDFS-14070. Refactor NameNodeWebHdfsMethods to allow better extensibility. Contributed by CR Hota
(cherry picked from commit e7b63baca1e10b28d8b4462fd80537b871951aa3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5e866412
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5e866412
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5e866412
Branch: refs/heads/branch-3.2
Commit: 5e86641265ef3ef7e30a106fd4608849806fe3b3
Parents: 359b1dd
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Nov 13 12:45:13 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Nov 13 13:09:03 2018 +0530
----------------------------------------------------------------------
.../web/resources/NamenodeWebHdfsMethods.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5e866412/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
index d73fd45..c4d3239 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
@@ -337,9 +337,22 @@ public class NamenodeWebHdfsMethods {
throw new IOException("No active nodes contain this block");
}
- private Token<? extends TokenIdentifier> generateDelegationToken(
- final NameNode namenode, final UserGroupInformation ugi,
+ public long renewDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ return cp.renewDelegationToken(token);
+ }
+
+ public void cancelDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ cp.cancelDelegationToken(token);
+ }
+
+ public Token<? extends TokenIdentifier> generateDelegationToken(
+ final UserGroupInformation ugi,
final String renewer) throws IOException {
+ final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Credentials c = DelegationTokenSecretManager.createCredentials(
namenode, ugi, renewer != null? renewer: ugi.getShortUserName());
if (c == null) {
@@ -384,7 +397,7 @@ public class NamenodeWebHdfsMethods {
} else {
//generate a token
final Token<? extends TokenIdentifier> t = generateDelegationToken(
- namenode, ugi, null);
+ ugi, null);
delegationQuery = "&" + new DelegationParam(t.encodeToUrlString());
}
@@ -705,7 +718,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- final long expiryTime = cp.renewDelegationToken(token);
+ final long expiryTime = renewDelegationToken(token);
final String js = JsonUtil.toJsonString("long", expiryTime);
return Response.ok(js).type(MediaType.APPLICATION_JSON).build();
}
@@ -714,7 +727,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- cp.cancelDelegationToken(token);
+ cancelDelegationToken(token);
return Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).build();
}
case MODIFYACLENTRIES: {
@@ -1138,9 +1151,8 @@ public class NamenodeWebHdfsMethods {
throw new IllegalArgumentException(delegation.getName()
+ " parameter is not null.");
}
- final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Token<? extends TokenIdentifier> token = generateDelegationToken(
- namenode, ugi, renewer.getValue());
+ ugi, renewer.getValue());
final String setServiceName = tokenService.getValue();
final String setKind = tokenKind.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/4] hadoop git commit: HDFS-14070. Refactor NameNodeWebHdfsMethods
to allow better extensibility. Contributed by CR Hota
Posted by br...@apache.org.
HDFS-14070. Refactor NameNodeWebHdfsMethods to allow better extensibility. Contributed by CR Hota
(cherry picked from commit e7b63baca1e10b28d8b4462fd80537b871951aa3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/04bba915
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/04bba915
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/04bba915
Branch: refs/heads/branch-3.0
Commit: 04bba915855bd7a5e055c3349d3068188f4dc645
Parents: ff1cbb4
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Nov 13 12:45:13 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Nov 13 13:12:56 2018 +0530
----------------------------------------------------------------------
.../web/resources/NamenodeWebHdfsMethods.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/04bba915/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
index e9f5628..238b529 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
@@ -333,9 +333,22 @@ public class NamenodeWebHdfsMethods {
throw new IOException("No active nodes contain this block");
}
- private Token<? extends TokenIdentifier> generateDelegationToken(
- final NameNode namenode, final UserGroupInformation ugi,
+ public long renewDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ return cp.renewDelegationToken(token);
+ }
+
+ public void cancelDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ cp.cancelDelegationToken(token);
+ }
+
+ public Token<? extends TokenIdentifier> generateDelegationToken(
+ final UserGroupInformation ugi,
final String renewer) throws IOException {
+ final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Credentials c = DelegationTokenSecretManager.createCredentials(
namenode, ugi, renewer != null? renewer: ugi.getShortUserName());
if (c == null) {
@@ -380,7 +393,7 @@ public class NamenodeWebHdfsMethods {
} else {
//generate a token
final Token<? extends TokenIdentifier> t = generateDelegationToken(
- namenode, ugi, null);
+ ugi, null);
delegationQuery = "&" + new DelegationParam(t.encodeToUrlString());
}
@@ -701,7 +714,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- final long expiryTime = cp.renewDelegationToken(token);
+ final long expiryTime = renewDelegationToken(token);
final String js = JsonUtil.toJsonString("long", expiryTime);
return Response.ok(js).type(MediaType.APPLICATION_JSON).build();
}
@@ -710,7 +723,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- cp.cancelDelegationToken(token);
+ cancelDelegationToken(token);
return Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).build();
}
case MODIFYACLENTRIES: {
@@ -1120,9 +1133,8 @@ public class NamenodeWebHdfsMethods {
throw new IllegalArgumentException(delegation.getName()
+ " parameter is not null.");
}
- final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Token<? extends TokenIdentifier> token = generateDelegationToken(
- namenode, ugi, renewer.getValue());
+ ugi, renewer.getValue());
final String setServiceName = tokenService.getValue();
final String setKind = tokenKind.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/4] hadoop git commit: HDFS-14070. Refactor NameNodeWebHdfsMethods
to allow better extensibility. Contributed by CR Hota
Posted by br...@apache.org.
HDFS-14070. Refactor NameNodeWebHdfsMethods to allow better extensibility. Contributed by CR Hota
(cherry picked from commit e7b63baca1e10b28d8b4462fd80537b871951aa3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d72c1348
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d72c1348
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d72c1348
Branch: refs/heads/branch-3.1
Commit: d72c134889b4aa1b3fd33575ceee1f2339836523
Parents: 1959ca6
Author: Brahma Reddy Battula <br...@apache.org>
Authored: Tue Nov 13 12:45:13 2018 +0530
Committer: Brahma Reddy Battula <br...@apache.org>
Committed: Tue Nov 13 13:11:39 2018 +0530
----------------------------------------------------------------------
.../web/resources/NamenodeWebHdfsMethods.java | 26 ++++++++++++++------
1 file changed, 19 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d72c1348/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
index a8ab798..fa4bd37 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/web/resources/NamenodeWebHdfsMethods.java
@@ -334,9 +334,22 @@ public class NamenodeWebHdfsMethods {
throw new IOException("No active nodes contain this block");
}
- private Token<? extends TokenIdentifier> generateDelegationToken(
- final NameNode namenode, final UserGroupInformation ugi,
+ public long renewDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ return cp.renewDelegationToken(token);
+ }
+
+ public void cancelDelegationToken(Token<DelegationTokenIdentifier> token)
+ throws IOException {
+ ClientProtocol cp = getRpcClientProtocol();
+ cp.cancelDelegationToken(token);
+ }
+
+ public Token<? extends TokenIdentifier> generateDelegationToken(
+ final UserGroupInformation ugi,
final String renewer) throws IOException {
+ final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Credentials c = DelegationTokenSecretManager.createCredentials(
namenode, ugi, renewer != null? renewer: ugi.getShortUserName());
if (c == null) {
@@ -381,7 +394,7 @@ public class NamenodeWebHdfsMethods {
} else {
//generate a token
final Token<? extends TokenIdentifier> t = generateDelegationToken(
- namenode, ugi, null);
+ ugi, null);
delegationQuery = "&" + new DelegationParam(t.encodeToUrlString());
}
@@ -702,7 +715,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- final long expiryTime = cp.renewDelegationToken(token);
+ final long expiryTime = renewDelegationToken(token);
final String js = JsonUtil.toJsonString("long", expiryTime);
return Response.ok(js).type(MediaType.APPLICATION_JSON).build();
}
@@ -711,7 +724,7 @@ public class NamenodeWebHdfsMethods {
validateOpParams(op, delegationTokenArgument);
final Token<DelegationTokenIdentifier> token = new Token<DelegationTokenIdentifier>();
token.decodeFromUrlString(delegationTokenArgument.getValue());
- cp.cancelDelegationToken(token);
+ cancelDelegationToken(token);
return Response.ok().type(MediaType.APPLICATION_OCTET_STREAM).build();
}
case MODIFYACLENTRIES: {
@@ -1123,9 +1136,8 @@ public class NamenodeWebHdfsMethods {
throw new IllegalArgumentException(delegation.getName()
+ " parameter is not null.");
}
- final NameNode namenode = (NameNode)context.getAttribute("name.node");
final Token<? extends TokenIdentifier> token = generateDelegationToken(
- namenode, ugi, renewer.getValue());
+ ugi, renewer.getValue());
final String setServiceName = tokenService.getValue();
final String setKind = tokenKind.getValue();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org