goiri commented on code in PR #4530:
URL: https://github.com/apache/hadoop/pull/4530#discussion_r914087254
##########
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/retry/RetryInvocationHandler.java:
##########
@@ -46,6 +46,15 @@
public static final Logger LOG = LoggerFactory.getLogger(
RetryInvocationHandler.class);
+ @VisibleForTesting
+ public static final ThreadLocal<Boolean> SET_CALL_ID_FOR_TEST =
+ new ThreadLocal<Boolean>() {
Review Comment:
There's no lambda or shorter version for this?
##########
hadoop-hdfs-project/hadoop-hdfs-rbf/src/test/java/org/apache/hadoop/hdfs/server/federation/router/TestRouterRetryCache.java:
##########
@@ -0,0 +1,122 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hdfs.server.federation.router;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.permission.FsPermission;
+import org.apache.hadoop.ha.HAServiceProtocol;
+import org.apache.hadoop.hdfs.server.federation.MiniRouterDFSCluster;
+import org.apache.hadoop.io.retry.RetryInvocationHandler;
+import org.apache.hadoop.ipc.Client;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.security.PrivilegedExceptionAction;
+
+import static org.apache.hadoop.hdfs.DFSConfigKeys.DFS_NAMENODE_IP_PROXY_USERS;
+import static
org.apache.hadoop.hdfs.server.federation.FederationTestUtils.NAMENODES;
+
+public class TestRouterRetryCache {
+ /** Federated HDFS cluster. */
+ private MiniRouterDFSCluster cluster;
+
+ @Before
+ public void setup() throws Exception {
+ Configuration namenodeConf = new Configuration();
+ namenodeConf.set(DFS_NAMENODE_IP_PROXY_USERS, "fake_joe");
+ cluster = new MiniRouterDFSCluster(true, 1);
+ cluster.addNamenodeOverrides(namenodeConf);
+
+ // Start NNs and DNs and wait until ready
+ cluster.startCluster();
+
+ // Start routers with only an RPC service
+ cluster.startRouters();
+
+ // Register and verify all NNs with all routers
+ cluster.registerNamenodes();
+ cluster.waitNamenodeRegistration();
+
+ // Setup the mount table
+ cluster.installMockLocations();
+
+ // Making one Namenodes active per nameservice
+ if (cluster.isHighAvailability()) {
+ for (String ns : cluster.getNameservices()) {
+ cluster.switchToActive(ns, NAMENODES[0]);
+ cluster.switchToStandby(ns, NAMENODES[1]);
+ }
+ }
+ cluster.waitActiveNamespaces();
+ }
+
+ @After
+ public void teardown() throws IOException {
+ if (cluster != null) {
+ cluster.shutdown();
+ cluster = null;
+ }
+ }
+
+ @Test
+ public void testRetryCache() throws Exception {
+ RetryInvocationHandler.SET_CALL_ID_FOR_TEST.set(false);
+ FileSystem routerFS = cluster.getRandomRouter().getFileSystem();
+ Path testDir = new Path("/target-ns0/testdir");
+ routerFS.mkdirs(testDir);
+ routerFS.setPermission(testDir, FsPermission.getDefault());
+
+ // Run as fake joe to authorize the test
+ UserGroupInformation joe =
+ UserGroupInformation.createUserForTesting("fake_joe",
+ new String[]{"fake_group"});
+ FileSystem joeFS = joe.doAs(
+ (PrivilegedExceptionAction<FileSystem>) () ->
+ FileSystem.newInstance(routerFS.getUri(), routerFS.getConf()));
+
+ Path renameSrc = new Path(testDir, "renameSrc");
+ Path renameDst = new Path(testDir, "renameDst");
+ joeFS.mkdirs(renameSrc);
+
+ Assert.assertEquals(HAServiceProtocol.HAServiceState.ACTIVE,
Review Comment:
You can statically import these asserts and just do `assertEqual()`
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java:
##########
@@ -495,6 +498,72 @@ public static NameNodeMetrics getNameNodeMetrics() {
return metrics;
}
+ private static String clientInfoFromContext(
+ final String[] ipProxyUsers) {
+ if (ipProxyUsers != null) {
+ UserGroupInformation user =
+ UserGroupInformation.getRealUserOrSelf(Server.getRemoteUser());
+ if (user != null &&
+ ArrayUtils.contains(ipProxyUsers, user.getShortUserName())) {
+ CallerContext context = CallerContext.getCurrent();
+ if (context != null && context.isContextValid()) {
+ return context.getContext();
+ }
+ }
+ }
+ return null;
+ }
+
+ private static String parseSpecialValue(String content, String key) {
Review Comment:
Can we have unit tests for this?
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java:
##########
@@ -495,6 +498,72 @@ public static NameNodeMetrics getNameNodeMetrics() {
return metrics;
}
+ private static String clientInfoFromContext(
+ final String[] ipProxyUsers) {
+ if (ipProxyUsers != null) {
+ UserGroupInformation user =
+ UserGroupInformation.getRealUserOrSelf(Server.getRemoteUser());
+ if (user != null &&
+ ArrayUtils.contains(ipProxyUsers, user.getShortUserName())) {
+ CallerContext context = CallerContext.getCurrent();
+ if (context != null && context.isContextValid()) {
+ return context.getContext();
+ }
+ }
+ }
+ return null;
+ }
+
+ private static String parseSpecialValue(String content, String key) {
+ int posn = content.indexOf(key);
+ if (posn != -1) {
+ posn += key.length();
+ int end = content.indexOf(",", posn);
+ return end == -1 ? content.substring(posn)
+ : content.substring(posn, end);
+ }
+ return null;
+ }
+
+ public static String getClientMachine(final String[] ipProxyUsers) {
+ String cc = clientInfoFromContext(ipProxyUsers);
+ if (cc != null) {
+ // if the rpc has a caller context of "clientIp:1.2.3.4,CLI",
+ // return "1.2.3.4" as the client machine.
+ String key = CallerContext.CLIENT_IP_STR +
+ CallerContext.Builder.KEY_VALUE_SEPARATOR;
+ return parseSpecialValue(cc, key);
+ }
+
+ String clientMachine = Server.getRemoteAddress();
+ if (clientMachine == null) { //not a RPC client
+ clientMachine = "";
+ }
+ return clientMachine;
+ }
+
+ public static Pair<byte[], Integer> getClientIdAndCallId(
Review Comment:
javadoc
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java:
##########
@@ -495,6 +498,72 @@ public static NameNodeMetrics getNameNodeMetrics() {
return metrics;
}
+ private static String clientInfoFromContext(
+ final String[] ipProxyUsers) {
+ if (ipProxyUsers != null) {
+ UserGroupInformation user =
+ UserGroupInformation.getRealUserOrSelf(Server.getRemoteUser());
+ if (user != null &&
+ ArrayUtils.contains(ipProxyUsers, user.getShortUserName())) {
+ CallerContext context = CallerContext.getCurrent();
+ if (context != null && context.isContextValid()) {
+ return context.getContext();
+ }
+ }
+ }
+ return null;
+ }
+
+ private static String parseSpecialValue(String content, String key) {
+ int posn = content.indexOf(key);
+ if (posn != -1) {
+ posn += key.length();
+ int end = content.indexOf(",", posn);
+ return end == -1 ? content.substring(posn)
+ : content.substring(posn, end);
+ }
+ return null;
+ }
+
+ public static String getClientMachine(final String[] ipProxyUsers) {
Review Comment:
javadoc
##########
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/NameNode.java:
##########
@@ -495,6 +498,72 @@ public static NameNodeMetrics getNameNodeMetrics() {
return metrics;
}
+ private static String clientInfoFromContext(
Review Comment:
One line and javadoc.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
