Repository: tez
Updated Branches:
  refs/heads/master 6970fb01b -> 5ef86035b


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


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

Branch: refs/heads/master
Commit: 5ef86035bb812330a542b5be5e1695939cdcb66b
Parents: 6970fb0
Author: Hitesh Shah <[email protected]>
Authored: Wed Aug 5 14:35:49 2015 -0700
Committer: Hitesh Shah <[email protected]>
Committed: Wed Aug 5 14:35:49 2015 -0700

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


http://git-wip-us.apache.org/repos/asf/tez/blob/5ef86035/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4bc08d9..04d551f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@ INCOMPATIBLE CHANGES
   TEZ-2650. Timing details on Vertex state changes
 
 ALL CHANGES:
+  TEZ-2630. TezChild receives IP address instead of FQDN.
   TEZ-2684. ShuffleVertexManager.parsePartitionStats throws 
IllegalStateException: Stats should be initialized.
   TEZ-2172. FetcherOrderedGrouped using List to store InputAttemptIdentifier 
can lead to some inefficiency during remove() operation.
   TEZ-2613. Fetcher(unordered) using List to store InputAttemptIdentifier can 
lead to some inefficiency during remove() operation.
@@ -65,6 +66,7 @@ Release 0.7.1: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-2630. TezChild receives IP address instead of FQDN.
   TEZ-2211. Tez UI: Allow users to configure timezone
   TEZ-2623. Fix module dependencies related to hadoop-auth.
   TEZ-1314. Port MAPREDUCE-5821 to Tez.
@@ -279,6 +281,13 @@ ALL CHANGES:
   TEZ-1949. Whitelist TEZ_RUNTIME_OPTIMIZE_SHARED_FETCH for broadcast edges.
   TEZ-1593. Refactor PipelinedSorter to remove all MMAP based ByteBuffer 
references.
 
+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/5ef86035/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 b7896c1..15cb801 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
@@ -146,7 +146,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/5ef86035/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);

Reply via email to