Repository: tez
Updated Branches:
refs/heads/branch-0.7 7b9413920 -> f57580e87
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/f57580e8
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/f57580e8
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/f57580e8
Branch: refs/heads/branch-0.7
Commit: f57580e877e9f0028c5171a14988da6d5264bbbc
Parents: 7b94139
Author: Hitesh Shah <[email protected]>
Authored: Wed Aug 5 14:35:49 2015 -0700
Committer: Hitesh Shah <[email protected]>
Committed: Wed Aug 5 14:37:54 2015 -0700
----------------------------------------------------------------------
CHANGES.txt | 8 ++++++++
.../org/apache/tez/dag/app/TaskAttemptListenerImpTezDag.java | 6 +++++-
.../java/org/apache/tez/dag/utils/TezRuntimeChildJVM.java | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/f57580e8/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 517144d..24dddf5 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,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.
@@ -219,6 +220,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/f57580e8/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 fe92f3a..ddbee59 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
@@ -147,7 +147,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/f57580e8/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);
