Repository: tez Updated Branches: refs/heads/master a991f17e4 -> c0faeaed6
TEZ-3742. Fix AMContainerHelpers#createCommonContainerLaunchContext to not pass localResources. (Kuhu Shukla via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/c0faeaed Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c0faeaed Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c0faeaed Branch: refs/heads/master Commit: c0faeaed6053b7ec102dedbae6ffdb2776a9c9cc Parents: a991f17 Author: Jonathan Eagles <[email protected]> Authored: Thu May 25 10:48:49 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Thu May 25 10:48:49 2017 -0500 ---------------------------------------------------------------------- .../org/apache/tez/dag/app/rm/container/AMContainerHelpers.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/c0faeaed/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java index cef1c30..ee32265 100644 --- a/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java +++ b/tez-dag/src/main/java/org/apache/tez/dag/app/rm/container/AMContainerHelpers.java @@ -95,7 +95,7 @@ public class AMContainerHelpers { */ private static ContainerLaunchContext createCommonContainerLaunchContext( Map<ApplicationAccessType, String> applicationACLs, - Credentials credentials, Map<String, LocalResource> localResources, String auxiliaryService) { + Credentials credentials, String auxiliaryService) { // Application environment Map<String, String> environment = new HashMap<String, String>(); @@ -159,7 +159,7 @@ public class AMContainerHelpers { synchronized (commonContainerSpecLock) { if (!commonContainerSpecs.containsKey(tezDAGID)) { commonContainerSpec = - createCommonContainerLaunchContext(acls, credentials, localResources, auxiliaryService); + createCommonContainerLaunchContext(acls, credentials, auxiliaryService); commonContainerSpecs.put(tezDAGID, commonContainerSpec); } else { commonContainerSpec = commonContainerSpecs.get(tezDAGID);
