Skip to content

HDFS-16895. NamenodeHeartbeatService should use credentials of logged… #5324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
omalley merged 6 commits into from
Feb 7, 2023
Merged

HDFS-16895. NamenodeHeartbeatService should use credentials of logged… #5324

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5acee71
HDFS-16895. NamenodeHeartbeatService should use credentials of logged…
hchaverri Jan 24, 2023
376e2e0
Removing extra space
hchaverri Jan 24, 2023
5e45328
Fixing typo in test
hchaverri Jan 30, 2023
d4e8bfe
Executing updateState as login user, instead of only JMX call
hchaverri Jan 31, 2023
75dc852
Cleaning up unit test
hchaverri Feb 3, 2023
d51321b
Removing blanks
hchaverri Feb 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions ...c/main/java/org/apache/hadoop/hdfs/server/federation/router/NamenodeHeartbeatService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.URI;
import java.security.PrivilegedExceptionAction;
import java.util.Map;
import java.util.concurrent.TimeUnit;

Expand All @@ -45,6 +46,7 @@
import org.apache.hadoop.hdfs.tools.NNHAServiceTarget;
import org.apache.hadoop.hdfs.web.URLConnectionFactory;
import org.apache.hadoop.net.NetUtils;
import org.apache.hadoop.security.SecurityUtil;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
Expand Down Expand Up @@ -339,8 +341,11 @@ protected NamenodeStatusReport getNamenodeStatusReport() {
// should be required at some point for QoS
updateSafeModeParameters(serviceURI, report);

// Read the stats from JMX (optional)
updateJMXParameters(webAddress, report);
// Read the stats from JMX (optional) using the login user credentials
SecurityUtil.doAsLoginUser((PrivilegedExceptionAction<Void>) () -> {

@omalley omalley Jan 30, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It feels like we should do this at a higher level eg. NamenodeHeartbeatService.periodicInvoke(). That way the other operations, such as the rpc call to each NN, also run as the login user.

@hchaverri hchaverri Jan 31, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only the JMX call is having issues authenticating, but I agree we should expect all requests to be made in the same context. I'll expand the scope of this.

updateJMXParameters(webAddress, report);
return null;
});

// Try to get the HA status
updateHAStatusParameters(report);
Expand Down
29 changes: 29 additions & 0 deletions ...est/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterNamenodeHeartbeat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.NAMENODES;
import static org.apache.hadoop.hdfs.server.federation.FederationTestUtils.NAMESERVICES;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

Expand All @@ -36,6 +37,7 @@
import java.util.List;

import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.contract.router.SecurityConfUtil;
import org.apache.hadoop.hdfs.DFSUtil;
import org.apache.hadoop.hdfs.HdfsConfiguration;
import org.apache.hadoop.hdfs.server.federation.MockResolver;
Expand Down Expand Up @@ -318,4 +320,31 @@ private Configuration generateNamenodeConfiguration(

return conf;
}

@Test
public void testNamendodeHeartbeatWithSecurity() throws Exception {

@simbadzina simbadzina Jan 30, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Typo "namendode" -> "namenode"

@hchaverri hchaverri Jan 30, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Thanks!

Configuration conf = SecurityConfUtil.initSecurity();
MiniRouterDFSCluster testCluster = null;
try {
testCluster = new MiniRouterDFSCluster(true, 1, conf);
// Start Namenodes and routers
testCluster.startCluster(conf);
testCluster.startRouters();

// Register Namenodes to generate a NamenodeStatusReport
testCluster.registerNamenodes();
testCluster.waitNamenodeRegistration();

for (MiniRouterDFSCluster.RouterContext routerContext : testCluster.getRouters()) {
ActiveNamenodeResolver resolver = routerContext.getRouter().getNamenodeResolver();
// Validate that NamenodeStatusReport has been registered
assertNotNull(resolver.getNamespaces());
assertFalse(resolver.getNamespaces().isEmpty());
}
} finally {
if (testCluster != null) {
testCluster.shutdown();
}
}
}
}