You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by el...@apache.org on 2014/01/03 06:41:09 UTC

git commit: ACCUMULO-2036 Try to get FQDN's for RangeInputSplit

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 9524e8171 -> a89d97a00


ACCUMULO-2036 Try to get FQDN's for RangeInputSplit

We want to make sure that we get FQDNs (when possible) as this
will be what gets data-local mappers (map task running on the same
host as the tabletserver feeding it data)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a89d97a0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a89d97a0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a89d97a0

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a89d97a003caa6a5a735098b6092f36ff86592b9
Parents: 9524e81
Author: Josh Elser <el...@apache.org>
Authored: Fri Jan 3 00:34:28 2014 -0500
Committer: Josh Elser <el...@apache.org>
Committed: Fri Jan 3 00:34:28 2014 -0500

----------------------------------------------------------------------
 .../apache/accumulo/core/client/mapred/AbstractInputFormat.java    | 2 +-
 .../apache/accumulo/core/client/mapreduce/AbstractInputFormat.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a89d97a0/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index 4e84909..4e04cf2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -583,7 +583,7 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
         String location = hostNameCache.get(ip);
         if (location == null) {
           InetAddress inetAddress = InetAddress.getByName(ip);
-          location = inetAddress.getHostName();
+          location = inetAddress.getCanonicalHostName();
           hostNameCache.put(ip, location);
         }
         for (Map.Entry<KeyExtent,List<Range>> extentRanges : tserverBin.getValue().entrySet()) {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a89d97a0/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index 9f30563..03c6a0a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -607,7 +607,7 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
           String location = hostNameCache.get(ip);
           if (location == null) {
             InetAddress inetAddress = InetAddress.getByName(ip);
-            location = inetAddress.getHostName();
+            location = inetAddress.getCanonicalHostName();
             hostNameCache.put(ip, location);
           }
           for (Map.Entry<KeyExtent,List<Range>> extentRanges : tserverBin.getValue().entrySet()) {