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 aa...@apache.org on 2020/11/17 01:57:25 UTC
[hadoop] branch trunk updated: HDFS-15685. [JDK 14]
TestConfiguredFailoverProxyProvider#testResolveDomainNameUsingDNS fails.
(#2465)
This is an automated email from the ASF dual-hosted git repository.
aajisaka pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new b57f04c HDFS-15685. [JDK 14] TestConfiguredFailoverProxyProvider#testResolveDomainNameUsingDNS fails. (#2465)
b57f04c is described below
commit b57f04cd5bffe4efa5dbee524f619864b05669c7
Author: Akira Ajisaka <aa...@apache.org>
AuthorDate: Tue Nov 17 10:56:56 2020 +0900
HDFS-15685. [JDK 14] TestConfiguredFailoverProxyProvider#testResolveDomainNameUsingDNS fails. (#2465)
---
.../ha/TestConfiguredFailoverProxyProvider.java | 23 ++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConfiguredFailoverProxyProvider.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConfiguredFailoverProxyProvider.java
index e3f34e3..f28bfa6 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConfiguredFailoverProxyProvider.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/test/java/org/apache/hadoop/hdfs/server/namenode/ha/TestConfiguredFailoverProxyProvider.java
@@ -23,6 +23,7 @@ import org.apache.hadoop.hdfs.protocol.ClientProtocol;
import org.apache.hadoop.net.MockDomainNameResolver;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.util.Shell;
import org.apache.hadoop.util.Time;
import org.junit.Before;
import org.junit.BeforeClass;
@@ -292,12 +293,22 @@ public class TestConfiguredFailoverProxyProvider {
MockDomainNameResolver.FQDN_2 : "/" + MockDomainNameResolver.ADDR_2;
// Check we got the proper addresses
assertEquals(2, proxyResults.size());
- assertTrue(
- "nn1 wasn't returned: " + proxyResults,
- proxyResults.containsKey(resolvedHost1 + ":8020"));
- assertTrue(
- "nn2 wasn't returned: " + proxyResults,
- proxyResults.containsKey(resolvedHost2 + ":8020"));
+ if (Shell.isJavaVersionAtLeast(14) && useFQDN) {
+ // JDK-8225499. The string format of unresolved address has been changed.
+ assertTrue(
+ "nn1 wasn't returned: " + proxyResults,
+ proxyResults.containsKey(resolvedHost1 + "/<unresolved>:8020"));
+ assertTrue(
+ "nn2 wasn't returned: " + proxyResults,
+ proxyResults.containsKey(resolvedHost2 + "/<unresolved>:8020"));
+ } else {
+ assertTrue(
+ "nn1 wasn't returned: " + proxyResults,
+ proxyResults.containsKey(resolvedHost1 + ":8020"));
+ assertTrue(
+ "nn2 wasn't returned: " + proxyResults,
+ proxyResults.containsKey(resolvedHost2 + ":8020"));
+ }
// Check that the Namenodes were invoked
assertEquals(NUM_ITERATIONS, nn1Count.get() + nn2Count.get());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org