tez git commit: TEZ-2630. TezChild receives IP address instead of FQDN. (hitesh)

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.5 5c571d592 -> 4bf4c4409


TEZ-2630. TezChild receives IP address instead of FQDN. (hitesh)

(cherry picked from commit 5ef86035bb812330a542b5be5e1695939cdcb66b)

Conflicts:
        CHANGES.txt


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

Branch: refs/heads/branch-0.5
Commit: 4bf4c4409115073502cd7132d819b7f21656e068
Parents: 5c571d5
Author: Hitesh Shah <hit...@apache.org>
Authored: Wed Aug 5 14:35:49 2015 -0700
Committer: Hitesh Shah <hit...@apache.org>
Committed: Wed Aug 5 14:46:12 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                    | 2 ++
 .../org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java   | 6 +++++-
 .../main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/4bf4c440/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 17757ff..7831fb9 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,11 +1,13 @@
 Apache Tez Change Log
 =====================
+
 Release 0.5.5: Unreleased
 
 INCOMPATIBLE CHANGES
   TEZ-2552. CRC errors can cause job to run for very long time in large jobs.
 
 ALL CHANGES:
+  TEZ-2630. TezChild receives IP address instead of FQDN. (hitesh)
   TEZ-2635. Limit number of attempts being downloaded in unordered fetch.
   TEZ-2636. MRInput and MultiMRInput should work for cases when there are 0 
physical inputs.
   TEZ-2600. When used with HDFS federation(viewfs) ,tez will throw a error

http://git-wip-us.apache.org/repos/asf/tez/blob/4bf4c440/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
----------------------------------------------------------------------
diff --git 
a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
 
b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
index 3864b03..c9dd4ea 100644
--- 
a/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
+++ 
b/tez-dag/src/main/java/org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java
@@ -140,7 +140,11 @@ public class TaskAttemptListenerImpTezDag extends 
AbstractService implements
         }
 
         server.start();
-        this.address = NetUtils.getConnectAddress(server);
+        InetSocketAddress serverBindAddress = 
NetUtils.getConnectAddress(server);
+        this.address = NetUtils.createSocketAddrForHost(
+            serverBindAddress.getAddress().getCanonicalHostName(),
+            serverBindAddress.getPort());
+
         LOG.info("Instantiated TaskAttemptListener RPC at " + this.address);
       } catch (IOException e) {
         throw new TezUncheckedException(e);

http://git-wip-us.apache.org/repos/asf/tez/blob/4bf4c440/tez-dag/src/main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java
----------------------------------------------------------------------
diff --git 
a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java 
b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java
index 09239a8..9458193 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java
@@ -86,7 +86,7 @@ public class TezRuntimeChildJVM {
     vargs.add(TezChild.class.getName());  // main of Child
 
     // pass TaskAttemptListener's address
-    vargs.add(taskAttemptListenerAddr.getAddress().getHostAddress());
+    vargs.add(taskAttemptListenerAddr.getAddress().getHostName());
     vargs.add(Integer.toString(taskAttemptListenerAddr.getPort()));
     vargs.add(containerIdentifier);
     vargs.add(tokenIdentifier);