Repository: tez Updated Branches: refs/heads/TEZ-3334 4e4471244 -> 0ac846ec5
TEZ-3587. Fetcher fetchInputs() can NPE on srcAttempt due to missing entry in pathToAttemptMap (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/0ac846ec Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/0ac846ec Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/0ac846ec Branch: refs/heads/TEZ-3334 Commit: 0ac846ec5a41dd9f7839774eb9af4c8036e64a5b Parents: 4e44712 Author: Jonathan Eagles <[email protected]> Authored: Thu Jan 19 17:11:29 2017 -0600 Committer: Jonathan Eagles <[email protected]> Committed: Thu Jan 19 17:11:29 2017 -0600 ---------------------------------------------------------------------- TEZ-3334-CHANGES.txt | 1 + .../org/apache/tez/runtime/library/common/shuffle/Fetcher.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/0ac846ec/TEZ-3334-CHANGES.txt ---------------------------------------------------------------------- diff --git a/TEZ-3334-CHANGES.txt b/TEZ-3334-CHANGES.txt index caad68d..d7c9e30 100644 --- a/TEZ-3334-CHANGES.txt +++ b/TEZ-3334-CHANGES.txt @@ -4,6 +4,7 @@ Apache Tez Change Log INCOMPATIBLE CHANGES: ALL CHANGES: + TEZ-3587. Fetcher fetchInputs() can NPE on srcAttempt due to missing entry in pathToAttemptMap TEZ-3586. Remove fusesource.leveldbjni from the tez-auxservices shaded jar TEZ-3532. Backport MAPREDUCE-6808. Log map attempts as part of shuffle handler audit log TEZ-3563. Tez Shuffle Handler logging fails to initialize http://git-wip-us.apache.org/repos/asf/tez/blob/0ac846ec/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java index 7b1abab..7b5ca17 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/Fetcher.java @@ -258,7 +258,7 @@ public class Fetcher extends CallableWithNdc<FetchResult> { if (in instanceof CompositeInputAttemptIdentifier) { CompositeInputAttemptIdentifier cin = (CompositeInputAttemptIdentifier)in; for (int i = 0; i < cin.getInputIdentifierCount(); i++) { - pathToAttemptMap.put(new PathPartition(cin.getPathComponent(), i), cin.expand(i)); + pathToAttemptMap.put(new PathPartition(cin.getPathComponent(), partition + i), cin.expand(i)); } } else { pathToAttemptMap.put(new PathPartition(in.getPathComponent(), 0), in);
