Author: eli Date: Mon Oct 8 18:17:39 2012 New Revision: 1395703 URL: http://svn.apache.org/viewvc?rev=1395703&view=rev Log: HADOOP-8804. Improve Web UIs when the wildcard address is used. Contributed by Senthil Kumar
Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1395703&r1=1395702&r2=1395703&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt Mon Oct 8 18:17:39 2012 @@ -292,6 +292,9 @@ Release 2.0.3-alpha - Unreleased HADOOP-8889. Upgrade to Surefire 2.12.3 (todd) + HADOOP-8804. Improve Web UIs when the wildcard address is used. + (Senthil Kumar via eli) + OPTIMIZATIONS HADOOP-8866. SampleQuantiles#query is O(N^2) instead of O(N). (Andrew Wang Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java?rev=1395703&r1=1395702&r2=1395703&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java Mon Oct 8 18:17:39 2012 @@ -34,6 +34,7 @@ import java.util.List; import java.util.Locale; import java.util.StringTokenizer; +import com.google.common.net.InetAddresses; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.Path; @@ -77,6 +78,9 @@ public class StringUtils { * @return the hostname to the first dot */ public static String simpleHostname(String fullHostname) { + if (InetAddresses.isInetAddress(fullHostname)) { + return fullHostname; + } int offset = fullHostname.indexOf('.'); if (offset != -1) { return fullHostname.substring(0, offset); Modified: hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java?rev=1395703&r1=1395702&r2=1395703&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java (original) +++ hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestStringUtils.java Mon Oct 8 18:17:39 2012 @@ -282,6 +282,19 @@ public class TestStringUtils extends Uni } } + @Test + public void testSimpleHostName() { + assertEquals("Should return hostname when FQDN is specified", + "hadoop01", + StringUtils.simpleHostname("hadoop01.domain.com")); + assertEquals("Should return hostname when only hostname is specified", + "hadoop01", + StringUtils.simpleHostname("hadoop01")); + assertEquals("Should not truncate when IP address is passed", + "10.10.5.68", + StringUtils.simpleHostname("10.10.5.68")); + } + // Benchmark for StringUtils split public static void main(String []args) { final String TO_SPLIT = "foo,bar,baz,blah,blah";