Repository: tez Updated Branches: refs/heads/branch-0.6 3288225a8 -> e4e51858b
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/e4e51858 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/e4e51858 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/e4e51858 Branch: refs/heads/branch-0.6 Commit: e4e51858b2ddb47057e7478beb1010ebcec0109f Parents: 3288225 Author: Hitesh Shah <[email protected]> Authored: Fri Apr 17 15:04:02 2015 -0700 Committer: Hitesh Shah <[email protected]> Committed: Fri Apr 17 15:07:07 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/e4e51858/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 3b238fa..573ebaf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -177,6 +177,7 @@ TEZ-UI CHANGES (TEZ-8): 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/e4e51858/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();
