Fix parsing of hostname/ip in ES 2.x

fix #614
elastic · Dec 3, 2015 · 98ab152 · 98ab152
1 parent 8d82071
commit 98ab152
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/mr/src/main/java/org/elasticsearch/hadoop/util/StringUtils.java b/mr/src/main/java/org/elasticsearch/hadoop/util/StringUtils.java
@@ -412,12 +412,15 @@ public static char[] jsonEncoding(String rawString) {
     public static IpAndPort parseIpAddress(String httpAddr) {
         // strip ip address - regex would work but it's overkill
 
-        // there are two formats - ip:port or [/ip:port]
+        // there are four formats - ip:port, hostname/ip:port or [/ip:port] and [hostname/ip:port]
         // first the ip is normalized
-        if (httpAddr.contains("[")) {
+        if (httpAddr.contains("/")) {
             int startIp = httpAddr.indexOf("/") + 1;
             int endIp = httpAddr.indexOf("]");
-            if (startIp < 0 || endIp < 0) {
+            if (endIp < 0) {
+                endIp = httpAddr.length();
+            }
+            if (startIp < 0) {
                 throw new EsHadoopIllegalStateException("Cannot parse http address " + httpAddr);
             }
             httpAddr = httpAddr.substring(startIp, endIp);

diff --git a/mr/src/test/java/org/elasticsearch/hadoop/util/StringUtilsTest.java b/mr/src/test/java/org/elasticsearch/hadoop/util/StringUtilsTest.java
@@ -20,7 +20,7 @@
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class StringUtilsTest {
 
@@ -30,4 +30,25 @@ public void testJsonEncodingQuote() {
         String jsonEscaped = "foo\\\"bar";
         assertEquals(jsonEscaped, StringUtils.jsonEncoding(value));
     }
+
+    @Test
+    public void testParseIpInEs1x() {
+        assertEquals("1.2.3.4", StringUtils.parseIpAddress("inet[/1.2.3.4:9200]").ip);
+    }
+
+    @Test
+    public void testParseIpInEs1xWithHostName() {
+        assertEquals("11.22.33.44", StringUtils.parseIpAddress("inet[foobar/11.22.33.44:9200]").ip);
+    }
+
+    @Test
+    public void testParseIpInEs2x() {
+        assertEquals("111.222.333.444", StringUtils.parseIpAddress("111.222.333.444:9200").ip);
+    }
+
+    @Test
+    public void testParseIpInEs2xWithHostName() {
+        assertEquals("11.222.3.4", StringUtils.parseIpAddress("foobar/11.222.3.4:9200").ip);
+    }
+
 }