MAPREDUCE-7429 Application log link is not accessible via TimelineServer WebUI in IPV6 scenario

Author: Daniel-009497

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java

@@ -247,6 +247,24 @@ public static InetSocketAddress createSocketAddr(String target,
     return createSocketAddrForHost(host, port);
   }
 
+  public static String normalizeV6Address(String target) {
+    if (!target.startsWith("[")) {
+      if (target.contains("%")) {
+        int i = target.lastIndexOf('%');
+        target = target.trim();
+        String port = target.substring(target.lastIndexOf(":") + 1);
+        String addr = target.substring(0, i);
+        target = "[" + addr + "]" + ":" + port;
+      } else {
+        int i = target.lastIndexOf(':');
+        String port = target.substring(target.lastIndexOf(":") + 1);
+        String addr = target.substring(0, i);
+        target = "[" + addr + "]" + ":" + port;
+      }
+    }
+    return target;
+  }
+
   private static final long URI_CACHE_SIZE_DEFAULT = 1000;
   private static final long URI_CACHE_EXPIRE_TIME_DEFAULT = 12;
   private static final Cache<String, URI> URI_CACHE = CacheBuilder.newBuilder()

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/util/WebAppUtils.java

@@ -30,6 +30,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.classification.InterfaceAudience.Private;
 import org.apache.hadoop.classification.InterfaceStability.Evolving;
 import org.apache.hadoop.conf.Configuration;
@@ -428,6 +429,12 @@ public static String getAggregatedLogURL(String serverHttpAddress,
         user == null || user.isEmpty()) {
       return null;
     }
+    String [] ipAdds = serverHttpAddress.split("//");
+    if (StringUtils.countMatches(ipAdds[1], ":") > 2) {
+      ipAdds[1] = NetUtils.normalizeV6Address(ipAdds[1]);
+      serverHttpAddress = ipAdds[0] + "//" + ipAdds[1];
+    }
+
     return PATH_JOINER.join(serverHttpAddress, "applicationhistory", "logs",
         allocatedNode, containerId, entity, user);
   }