tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hit...@apache.org
Subject tez git commit: TEZ-2334. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy. (Chang Li via hitesh)
Date Fri, 17 Apr 2015 22:07:40 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.5 1d2725b79 -> eaa2ba8c6


TEZ-2334. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy.
(Chang Li via hitesh)

(cherry picked from commit 57c62f1f1fc9cd22dc858d3d22d7c13cdc427084)


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

Branch: refs/heads/branch-0.5
Commit: eaa2ba8c6ab3e060198c40a68d927744eb7921e4
Parents: 1d2725b
Author: Hitesh Shah <hitesh@apache.org>
Authored: Fri Apr 17 15:04:02 2015 -0700
Committer: Hitesh Shah <hitesh@apache.org>
Committed: Fri Apr 17 15:07:28 2015 -0700

----------------------------------------------------------------------
 CHANGES.txt                                                       | 1 +
 .../org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/eaa2ba8c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 9b2d24a..2d83886 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,7 @@ Apache Tez Change Log
 Release 0.5.4: Unreleased
 
 ALL CHANGES:
+  TEZ-2334. ContainerManagementProtocolProxy modifies IPC timeout conf without making a copy.
   TEZ-2317. Event processing backlog can result in task failures for short
   tasks
   TEZ-2289. ATSHistoryLoggingService can generate ArrayOutOfBoundsException.

http://git-wip-us.apache.org/repos/asf/tez/blob/eaa2ba8c/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
index 67832fa..65e8289 100644
--- a/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
+++ b/tez-dag/src/main/java/org/apache/tez/dag/app/launcher/ContainerLauncherImpl.java
@@ -259,8 +259,9 @@ public class ContainerLauncherImpl extends AbstractService implements
 
   @Override
   public void serviceStart() {
+    // pass a copy of config to ContainerManagementProtocolProxy until YARN-3497 is fixed
     cmProxy =
-        new ContainerManagementProtocolProxy(getConfig());
+        new ContainerManagementProtocolProxy(new Configuration(getConfig()));
 
     ThreadFactory tf = new ThreadFactoryBuilder().setNameFormat(
         "ContainerLauncher #%d").setDaemon(true).build();


Mime
View raw message