From f0f8fea4dff50ecd88dfd9318e834fa02f2f53ff Mon Sep 17 00:00:00 2001 From: Jason O'Sullivan Date: Wed, 29 Jul 2026 09:53:51 +0100 Subject: [PATCH 1/5] HDDS-16016. Adding unit test for datanodeUseHostname functionality in XceiverClientGrpc --- .../hdds/scm/TestXceiverClientGrpc.java | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java diff --git a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java new file mode 100644 index 000000000000..2af16632b6f4 --- /dev/null +++ b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java @@ -0,0 +1,67 @@ +/* + * 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.hdds.scm; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +import java.io.IOException; +import java.util.Collections; +import java.util.UUID; +import org.apache.hadoop.hdds.HddsConfigKeys; +import org.apache.hadoop.hdds.conf.OzoneConfiguration; +import org.apache.hadoop.hdds.protocol.DatanodeDetails; +import org.apache.hadoop.hdds.protocol.DatanodeID; +import org.apache.hadoop.hdds.protocol.MockDatanodeDetails; +import org.apache.hadoop.hdds.scm.pipeline.MockPipeline; +import org.apache.hadoop.hdds.scm.pipeline.Pipeline; +import org.apache.ratis.thirdparty.io.grpc.ManagedChannel; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class TestXceiverClientGrpc { + + private static final int PORT = 9882; + private static final String HOSTNAME = "dn-host.example.com"; + private static final String IP_ADDRESS = "192.168.1.100"; + + @ParameterizedTest(name = "useDatanodeHostname={0}") + @ValueSource(booleans = {false, true}) + void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException { + OzoneConfiguration conf = new OzoneConfiguration(); + conf.setBoolean(HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); + + DatanodeDetails dn = datanodeWithDistinctHostAndIp(); + Pipeline pipeline = MockPipeline.createPipeline(Collections.singletonList(dn)); + + XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf); + ManagedChannel channel = client.createChannel(dn, PORT).build(); + try { + String expectedHost = useHostname ? HOSTNAME : IP_ADDRESS; + assertThat(channel.authority()).isEqualTo(expectedHost + ":" + PORT); + } finally { + channel.shutdownNow(); + } + } + + private static DatanodeDetails datanodeWithDistinctHostAndIp() { + return MockDatanodeDetails.createDatanodeDetails( + DatanodeID.of(UUID.randomUUID()), HOSTNAME, IP_ADDRESS, "/rack"); + } + +} From 4a83ad24f10d89562054e23c9e4c5bf4ac13afc5 Mon Sep 17 00:00:00 2001 From: Jason O'Sullivan Date: Wed, 29 Jul 2026 10:39:52 +0100 Subject: [PATCH 2/5] HDDS-16016. Adding unit test for datanodeUseHostname functionality in XceiverClientGrpc --- .../hdds/scm/TestXceiverClientGrpc.java | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java index 2af16632b6f4..8c72b991aadf 100644 --- a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java +++ b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java @@ -1,19 +1,18 @@ /* - * 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 + * 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. + * 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.hdds.scm; From 755b79dc32a465288562f2f16b1f66568d21f6d4 Mon Sep 17 00:00:00 2001 From: Jason O'Sullivan Date: Wed, 29 Jul 2026 15:33:48 +0100 Subject: [PATCH 3/5] HDDS-16016. Renaming unit test to TestXceiverClientGrpcChannel --- ...rClientGrpc.java => TestXceiverClientGrpcChannel.java} | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) rename hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/{TestXceiverClientGrpc.java => TestXceiverClientGrpcChannel.java} (91%) diff --git a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java similarity index 91% rename from hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java rename to hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java index 8c72b991aadf..29be57f20dd3 100644 --- a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpc.java +++ b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java @@ -17,11 +17,12 @@ package org.apache.hadoop.hdds.scm; -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import java.io.IOException; import java.util.Collections; import java.util.UUID; +import java.util.concurrent.TimeUnit; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; import org.apache.hadoop.hdds.protocol.DatanodeDetails; @@ -33,7 +34,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; -class TestXceiverClientGrpc { +class TestXceiverClientGrpcChannel { private static final int PORT = 9882; private static final String HOSTNAME = "dn-host.example.com"; @@ -41,7 +42,7 @@ class TestXceiverClientGrpc { @ParameterizedTest(name = "useDatanodeHostname={0}") @ValueSource(booleans = {false, true}) - void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException { + void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException, InterruptedException { OzoneConfiguration conf = new OzoneConfiguration(); conf.setBoolean(HddsConfigKeys.HDDS_DATANODE_USE_DN_HOSTNAME, useHostname); @@ -55,6 +56,7 @@ void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException assertThat(channel.authority()).isEqualTo(expectedHost + ":" + PORT); } finally { channel.shutdownNow(); + channel.awaitTermination(10, TimeUnit.SECONDS); } } From 551a925b4ef81a2af3164ce210b14fd6354314a6 Mon Sep 17 00:00:00 2001 From: Jason O'Sullivan Date: Wed, 29 Jul 2026 16:29:32 +0100 Subject: [PATCH 4/5] HDDS-16016. Updating shutdown timeout for TestXceiverClientGrpcChannel --- .../apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java index 29be57f20dd3..09304da46c36 100644 --- a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java +++ b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java @@ -56,7 +56,7 @@ void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException, assertThat(channel.authority()).isEqualTo(expectedHost + ":" + PORT); } finally { channel.shutdownNow(); - channel.awaitTermination(10, TimeUnit.SECONDS); + channel.awaitTermination(5, TimeUnit.SECONDS); } } From c17108bb2102a23cd8afd9808e927ebc4fa0d41b Mon Sep 17 00:00:00 2001 From: Jason O'Sullivan Date: Thu, 30 Jul 2026 13:12:50 +0100 Subject: [PATCH 5/5] HDDS-16016. Improve TestXceiverClientGrpcChannel.createChannelUsesConfiguredAddress unit test --- .../scm/TestXceiverClientGrpcChannel.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java index 09304da46c36..7b84dff590d8 100644 --- a/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java +++ b/hadoop-hdds/client/src/test/java/org/apache/hadoop/hdds/scm/TestXceiverClientGrpcChannel.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.Collections; -import java.util.UUID; import java.util.concurrent.TimeUnit; import org.apache.hadoop.hdds.HddsConfigKeys; import org.apache.hadoop.hdds.conf.OzoneConfiguration; @@ -49,20 +48,21 @@ void createChannelUsesConfiguredAddress(boolean useHostname) throws IOException, DatanodeDetails dn = datanodeWithDistinctHostAndIp(); Pipeline pipeline = MockPipeline.createPipeline(Collections.singletonList(dn)); - XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf); - ManagedChannel channel = client.createChannel(dn, PORT).build(); - try { - String expectedHost = useHostname ? HOSTNAME : IP_ADDRESS; - assertThat(channel.authority()).isEqualTo(expectedHost + ":" + PORT); - } finally { - channel.shutdownNow(); - channel.awaitTermination(5, TimeUnit.SECONDS); + try (XceiverClientGrpc client = new XceiverClientGrpc(pipeline, conf)) { + ManagedChannel channel = client.createChannel(dn, PORT).build(); + try { + String expectedHost = useHostname ? HOSTNAME : IP_ADDRESS; + assertThat(channel.authority()).isEqualTo(expectedHost + ":" + PORT); + } finally { + channel.shutdownNow(); + channel.awaitTermination(5, TimeUnit.SECONDS); + } } } private static DatanodeDetails datanodeWithDistinctHostAndIp() { return MockDatanodeDetails.createDatanodeDetails( - DatanodeID.of(UUID.randomUUID()), HOSTNAME, IP_ADDRESS, "/rack"); + DatanodeID.randomID(), HOSTNAME, IP_ADDRESS, "/rack"); } }