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

[hitesh]

Repository: tez
Updated Branches:
  refs/heads/branch-0.6 abf49328b -> 6360867cb


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

(cherry picked from commit 5ef86035bb812330a542b5be5e1695939cdcb66b)

Conflicts:
        CHANGES.txt

(cherry picked from commit f57580e877e9f0028c5171a14988da6d5264bbbc)

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/6360867c
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/6360867c
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/6360867c

Branch: refs/heads/branch-0.6
Commit: 6360867cb9ce16475dd21518303da826c54f03a4
Parents: abf4932
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:39:44 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/6360867c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b4ba939..21fa096 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,13 @@
 Apache Tez Change Log
 =====================
 
+Release 0.6.3: Unreleased
+
+INCOMPATIBLE CHANGES
+
+ALL CHANGES:
+  TEZ-2630. TezChild receives IP address instead of FQDN.
+
 Release 0.6.2: Unreleased
 
 INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/tez/blob/6360867c/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/6360867c/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);