From 6d81a5761c9c4ebf77cf1b0deda57ab7b7f04ad4 Mon Sep 17 00:00:00 2001 From: manukranthk Date: Mon, 29 Sep 2014 16:31:32 -0700 Subject: [PATCH] Fix TableInputFormatBase.reverseDNS for ipv6 addresses Summary: Hadoop's DNS.reverDns function cannot handle Inet6Address properly and throws Runtime Exceptions. Test Plan: Added Unit test to test the particular case. Differential Revision: https://reviews.facebook.net/D24225 --- .../hbase/mapreduce/TableInputFormatBase.java | 6 ++- .../hadoop/hbase/mapred/TestTableInputFormat.java | 6 ++- .../hbase/mapreduce/TestTableInputFormatBase.java | 52 ++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java index d251096..418f2cf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableInputFormatBase.java @@ -21,6 +21,7 @@ package org.apache.hadoop.hbase.mapreduce; import java.io.IOException; import java.net.InetAddress; import java.net.InetSocketAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -220,11 +221,12 @@ extends InputFormat { return splits; } - private String reverseDNS(InetAddress ipAddress) throws NamingException { + public String reverseDNS(InetAddress ipAddress) throws NamingException, UnknownHostException { String hostName = this.reverseDNSCacheMap.get(ipAddress); if (hostName == null) { hostName = Strings.domainNamePointerToHostName( - DNS.reverseDns(ipAddress, this.nameServer)); + InetAddress.getByName(ipAddress.getHostAddress()).getHostName()); +// DNS.reverseDns(ipAddress, nameServer)); this.reverseDNSCacheMap.put(ipAddress, hostName); } return hostName; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java index 6a6da1f..385bc9a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapred/TestTableInputFormat.java @@ -29,9 +29,14 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.spy; import java.io.IOException; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.Arrays; import java.util.Map; +import javax.naming.NamingException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.*; @@ -386,6 +391,5 @@ public class TestTableInputFormat { Table htable = createDNRIOEScannerTable("table5-mr".getBytes(), 2); runTestMapreduce(htable); } - } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java new file mode 100644 index 0000000..2502c06 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/mapreduce/TestTableInputFormatBase.java @@ -0,0 +1,52 @@ +/** + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.mapreduce; + +import static org.junit.Assert.*; + +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; + +import javax.naming.NamingException; + +import org.junit.Test; + +public class TestTableInputFormatBase { + @Test + public void testTableInputFormatBaseReverseDNSForIPv6() + throws UnknownHostException, NamingException { + String address = "ipv6.google.com"; + String localhost = null; + InetAddress addr = null; + TableInputFormat inputFormat = new TableInputFormat(); + try { + localhost = InetAddress.getByName(address).getCanonicalHostName(); + addr = Inet6Address.getByName(address); + } catch (UnknownHostException e) { + // google.com is down, we can probably forgive this test. + return; + } + System.out.println("Should retrun the hostname for this host " + + localhost + " addr : " + addr); + String actualHostName = inputFormat.reverseDNS(addr); + assertEquals("Should retrun the hostname for this host. Expected : " + + localhost + " Actual : " + actualHostName, localhost, actualHostName); + } +} -- 1.9.4