big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-16946. Fix getTopTokenRealOwners to return String (#5696). Contributed by Nishtha Shah.

Browse Source 
Reviewed-by: Inigo Goiri <inigoiri@apache.org>
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
This commit is contained in:
NishthaShah 2023-06-13 10:01:35 +05:30 committed by GitHub
parent e1bb4acd36
commit 3fbadc5d50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
View File

@ -81,12 +81,14 @@
import org.apache.hadoop.hdfs.server.federation.store.records.MountTable;
import org.apache.hadoop.hdfs.server.federation.store.records.RouterState;
import org.apache.hadoop.hdfs.server.federation.store.records.StateStoreVersion;
import org.apache.hadoop.hdfs.web.JsonUtil;
import org.apache.hadoop.metrics2.MetricsSystem;
import org.apache.hadoop.metrics2.annotation.Metric;
import org.apache.hadoop.metrics2.annotation.Metrics;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.lib.MetricsRegistry;
import org.apache.hadoop.metrics2.util.MBeans;
import org.apache.hadoop.metrics2.util.Metrics2Util;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.VersionInfo;
@ -712,13 +714,18 @@ public long getCurrentTokensCount() {
@Override
public String getTopTokenRealOwners() {
RouterSecurityManager mgr =
this.router.getRpcServer().getRouterSecurityManager();
String topTokenRealOwnersString = "";
RouterSecurityManager mgr = this.router.getRpcServer().getRouterSecurityManager();
if (mgr != null && mgr.getSecretManager() != null) {
return JSON.toString(mgr.getSecretManager()
.getTopTokenRealOwners(this.topTokenRealOwners));
try {
List<Metrics2Util.NameValuePair> topOwners = mgr.getSecretManager()
.getTopTokenRealOwners(this.topTokenRealOwners);
topTokenRealOwnersString = JsonUtil.toJsonString(topOwners);
} catch (Exception e) {
LOG.error("Unable to fetch the top token real owners as string {}", e.getMessage());
}
}
return "";
return topTokenRealOwnersString;
}
@Override

53
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/security/TestRouterSecurityManager.java
View File

@ -18,16 +18,21 @@
package org.apache.hadoop.hdfs.server.federation.security;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.contract.router.RouterHDFSContract;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenIdentifier;
import org.apache.hadoop.hdfs.server.federation.FederationTestUtils;
import org.apache.hadoop.hdfs.server.federation.RouterConfigBuilder;
import org.apache.hadoop.hdfs.server.federation.metrics.RouterMBean;
import org.apache.hadoop.hdfs.server.federation.router.security.RouterSecurityManager;
import org.apache.hadoop.hdfs.server.federation.router.Router;
import org.apache.hadoop.hdfs.server.federation.router.security.token.ZKDelegationTokenSecretManagerImpl;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
import org.apache.hadoop.metrics2.util.Metrics2Util.NameValuePair;
import org.apache.hadoop.security.Credentials;
import org.apache.hadoop.security.UserGroupInformation;
@ -48,6 +53,7 @@
import static org.apache.hadoop.fs.contract.router.SecurityConfUtil.initSecurity;
import static org.apache.hadoop.fs.CommonConfigurationKeysPublic.HADOOP_SECURITY_AUTHENTICATION;
import static org.apache.hadoop.hdfs.server.federation.router.RBFConfigKeys.DFS_ROUTER_DELEGATION_TOKEN_DRIVER_CLASS;
import static org.apache.hadoop.hdfs.server.federation.metrics.TestRBFMetrics.ROUTER_BEAN;
import org.hamcrest.core.StringContains;
import java.io.IOException;
@ -76,11 +82,19 @@ public static void createMockSecretManager() throws IOException {
mockDelegationTokenSecretManager.startThreads();
securityManager =
new RouterSecurityManager(mockDelegationTokenSecretManager);
DefaultMetricsSystem.setMiniClusterMode(true);
}
@Rule
public ExpectedException exceptionRule = ExpectedException.none();
private Router initializeAndStartRouter(Configuration configuration) {
Router router = new Router();
router.init(configuration);
router.start();
return router;
}
@Test
public void testCreateSecretManagerUsingReflection() throws IOException {
Configuration conf = new HdfsConfiguration();
@ -227,9 +241,8 @@ public void testCreateCredentials() throws Exception {
.build();
conf.addResource(routerConf);
Router router = new Router();
router.init(conf);
router.start();
Router router = initializeAndStartRouter(conf);
UserGroupInformation ugi =
UserGroupInformation.createUserForTesting(
@ -259,6 +272,40 @@ private static String[] getUserGroupForTesting() {
return groupsForTesting;
}
@Test
public void testGetTopTokenRealOwners() throws Exception {
// Create conf and start routers with only an RPC service
Configuration conf = initSecurity();
Configuration routerConf = new RouterConfigBuilder()
.metrics()
.rpc()
.build();
conf.addResource(routerConf);
Router router = initializeAndStartRouter(conf);
// Create credentials
UserGroupInformation ugi =
UserGroupInformation.createUserForTesting("router", getUserGroupForTesting());
RouterSecurityManager.createCredentials(router, ugi, "some_renewer");
String host = Path.WINDOWS ? "127.0.0.1" : "localhost";
String expectedOwner = "router/" + host + "@EXAMPLE.COM";
// Fetch the top token owners string
RouterMBean bean = FederationTestUtils.getBean(
ROUTER_BEAN, RouterMBean.class);
String topTokenRealOwners = bean.getTopTokenRealOwners();
// Verify the token details with the expectedOwner
JsonNode topTokenRealOwnersList = new ObjectMapper().readTree(topTokenRealOwners);
assertEquals("The key:name contains incorrect value " + topTokenRealOwners, expectedOwner,
topTokenRealOwnersList.get(0).get("name").asText());
// Destroy the cluster
RouterHDFSContract.destroyCluster();
}
@Test
public void testWithoutSecretManager() throws Exception {
Configuration conf = initSecurity();