HADOOP-17542. IPV6 support in Netutils#createSocketAddress, review comments

Author: prasad-acit

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/ChecksumFileSystem.java

@@ -30,7 +30,6 @@
 import java.util.concurrent.CompletableFuture;
 
 import org.apache.hadoop.thirdparty.com.google.common.base.Preconditions;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
 import org.apache.hadoop.conf.Configuration;
@@ -105,18 +104,12 @@ public FileSystem getRawFileSystem() {
 
   /** Return the name of the checksum file associated with a file.*/
   public Path getChecksumFile(Path file) {
-    if (StringUtils.countMatches(file.toString(), ":") > 2) {
-      return new Path(file.getParent(), "./" + file.getName() + ".crc");
-    }
     return new Path(file.getParent(), "." + file.getName() + ".crc");
   }
 
   /** Return true iff file is a checksum file name.*/
   public static boolean isChecksumFile(Path file) {
     String name = file.getName();
-    if (StringUtils.countMatches(file.toString(), ":") > 2) {
-      return name.startsWith("./") && name.endsWith(".crc");
-    }
     return name.startsWith(".") && name.endsWith(".crc");
   }
 

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java

@@ -200,13 +200,14 @@ public Path(String pathString) throws IllegalArgumentException {
 
     // parse uri scheme, if any
     int colon = -1;
-    int slash = -1;
+    int slash = pathString.indexOf('/');
     if (StringUtils.countMatches(pathString, ":") > 2) {
+      //In case of IPv6 address, we should be able to parse the scheme
+      // correctly (This will ensure to parse path with & without scheme
+      // correctly in IPv6).
       colon = pathString.indexOf(":/");
-      slash = pathString.indexOf('/');
     } else {
       colon = pathString.indexOf(':');
-      slash = pathString.indexOf('/');
     }
     if ((colon != -1) &&
         ((slash == -1) || (colon < slash))) {     // has a scheme

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java

@@ -820,37 +820,38 @@ private <T> void assertBetterArrayEquals(T[] expect, T[]got) {
 
   @Test
   public void testCreateSocketAddressWithIPV6() throws Throwable {
-    String IPV6_SAMPLE_ADDRESS = "2a03:2880:2130:cf05:face:b00c:0:1";
-    String IPV6_SAMPLE_WITH_PORT = IPV6_SAMPLE_ADDRESS + ":12345";
+    String ipv6Address = "2a03:2880:2130:cf05:face:b00c:0:1";
+    String ipv6WithPort = ipv6Address + ":12345";
 
-    InetSocketAddress addr = NetUtils.createSocketAddr(IPV6_SAMPLE_WITH_PORT,
+    InetSocketAddress addr = NetUtils.createSocketAddr(ipv6WithPort,
         1000, "myconfig");
-    assertEquals("[" + IPV6_SAMPLE_ADDRESS + "]", addr.getHostName());
+    assertEquals("[" + ipv6Address + "]", addr.getHostName());
     assertEquals(12345, addr.getPort());
 
-    String IPV6_SAMPLE_ADDRESS_WITHSCOPE = IPV6_SAMPLE_ADDRESS + "%2";
-    IPV6_SAMPLE_WITH_PORT = IPV6_SAMPLE_ADDRESS_WITHSCOPE + ":12345";
-    addr = NetUtils.createSocketAddr(IPV6_SAMPLE_WITH_PORT, 1000, "myconfig");
-    assertEquals("[" + IPV6_SAMPLE_ADDRESS + "]", addr.getHostName());
+    String ipv6SampleAddressWithScope = ipv6Address + "%2";
+    ipv6WithPort = ipv6SampleAddressWithScope + ":12345";
+    addr = NetUtils.createSocketAddr(ipv6WithPort, 1000, "myconfig");
+    assertEquals("[" + ipv6Address + "]", addr.getHostName());
     assertEquals(12345, addr.getPort());
 
-    IPV6_SAMPLE_ADDRESS = "[2a03:2880:2130:cf05:face:b00c:0:1]";
-    IPV6_SAMPLE_WITH_PORT = IPV6_SAMPLE_ADDRESS + ":12345";
+    ipv6Address = "[2a03:2880:2130:cf05:face:b00c:0:1]";
+    ipv6WithPort = ipv6Address + ":12345";
 
-    addr = NetUtils.createSocketAddr(IPV6_SAMPLE_WITH_PORT, 1000, "myconfig");
-    assertEquals(IPV6_SAMPLE_ADDRESS, addr.getHostName());
+    addr = NetUtils.createSocketAddr(ipv6WithPort, 1000, "myconfig");
+    assertEquals(ipv6Address, addr.getHostName());
     assertEquals(12345, addr.getPort());
 
-    String IPV6_ADDRESS_WITH_SCHEME = "https://2a03:2880:2130:cf05:face:b00c:0:1:12345";
-    addr = NetUtils.createSocketAddr(IPV6_ADDRESS_WITH_SCHEME, 1000,
+    String ipv6AddressWithScheme =
+        "https://2a03:2880:2130:cf05:face:b00c:0:1:12345";
+    addr = NetUtils.createSocketAddr(ipv6AddressWithScheme, 1000,
         "myconfig");
-    assertEquals(IPV6_SAMPLE_ADDRESS, addr.getHostName());
+    assertEquals(ipv6Address, addr.getHostName());
     assertEquals(12345, addr.getPort());
 
-    IPV6_ADDRESS_WITH_SCHEME = "https://[2a03:2880:2130:cf05:face:b00c:0:1]:12345";
-    addr = NetUtils.createSocketAddr(IPV6_ADDRESS_WITH_SCHEME, 1000,
+    ipv6AddressWithScheme = "https://[2a03:2880:2130:cf05:face:b00c:0:1]:12345";
+    addr = NetUtils.createSocketAddr(ipv6AddressWithScheme, 1000,
         "myconfig");
-    assertEquals(IPV6_SAMPLE_ADDRESS, addr.getHostName());
+    assertEquals(ipv6Address, addr.getHostName());
     assertEquals(12345, addr.getPort());
   }
 }