diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java index 91e4c9d..cc373b3 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/ServerName.java @@ -18,6 +18,7 @@ */ package org.apache.hadoop.hbase; +import com.google.common.net.InetAddresses; import com.google.protobuf.InvalidProtocolBufferException; import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceStability; @@ -83,7 +84,7 @@ public class ServerName implements Comparable { public static final String UNKNOWN_SERVERNAME = "#unknown#"; private final String servername; - private final String hostname; + private final String hostnameOnly; private final int port; private final long startcode; @@ -95,10 +96,23 @@ public class ServerName implements Comparable { public static final List EMPTY_SERVER_LIST = new ArrayList(0); public ServerName(final String hostname, final int port, final long startcode) { - this.hostname = hostname; + // Drop the domain is there is one; no need of it in a local cluster. With it, we get long + // unwieldy names. + this.hostnameOnly = getHostNameMinusDomain(hostname); this.port = port; this.startcode = startcode; - this.servername = getServerName(hostname, port, startcode); + this.servername = getServerName(this.hostnameOnly, port, startcode); + } + + /** + * @param hostname + * @return hostname minus the domain, if there is one (will do pass-through on ip addresses) + */ + static String getHostNameMinusDomain(final String hostname) { + if (InetAddresses.isInetAddress(hostname)) return hostname; + String [] parts = hostname.split("\\."); + if (parts == null || parts.length == 0) return hostname; + return parts[0]; } public ServerName(final String serverName) { @@ -150,7 +164,7 @@ public class ServerName implements Comparable { } public String getHostname() { - return hostname; + return hostnameOnly; } public int getPort() { @@ -197,7 +211,7 @@ public class ServerName implements Comparable { * {@link Addressing#createHostAndPortStr(String, int)} */ public String getHostAndPort() { - return Addressing.createHostAndPortStr(this.hostname, this.port); + return Addressing.createHostAndPortStr(this.hostnameOnly, this.port); } /** diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java index 7d0f775..b235dab 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/JVMClusterUtil.java @@ -48,7 +48,7 @@ public class JVMClusterUtil { private final HRegionServer regionServer; public RegionServerThread(final HRegionServer r, final int index) { - super(r, "RegionServer:" + index + ";" + r.getServerName()); + super(r, "RS:" + index + ";" + r.getServerName()); this.regionServer = r; } @@ -109,7 +109,7 @@ public class JVMClusterUtil { private final HMaster master; public MasterThread(final HMaster m, final int index) { - super(m, "Master:" + index + ";" + m.getServerName()); + super(m, "M:" + index + ";" + m.getServerName()); this.master = m; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java index 52a7c1a..2c78691 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestServerName.java @@ -32,6 +32,20 @@ import org.junit.experimental.categories.Category; @Category(SmallTests.class) public class TestServerName { @Test + public void testGetHostNameMinusDomain() { + assertEquals("2607:f0d0:1002:51::4", + ServerName.getHostNameMinusDomain("2607:f0d0:1002:51::4")); + assertEquals("2607:f0d0:1002:0051:0000:0000:0000:0004", + ServerName.getHostNameMinusDomain("2607:f0d0:1002:0051:0000:0000:0000:0004")); + assertEquals("1.1.1.1", ServerName.getHostNameMinusDomain("1.1.1.1")); + assertEquals("x", ServerName.getHostNameMinusDomain("x")); + assertEquals("x", ServerName.getHostNameMinusDomain("x.y.z")); + assertEquals("asf000", ServerName.getHostNameMinusDomain("asf000.sp2.ygridcore.net")); + ServerName sn = new ServerName("asf000.sp2.ygridcore.net", 1, 1); + assertEquals("asf000,1,1", sn.toString()); + } + + @Test public void testRegexPatterns() { assertTrue(Pattern.matches(Addressing.VALID_PORT_REGEX, "123")); assertFalse(Pattern.matches(Addressing.VALID_PORT_REGEX, ""));