TEZ-3334 merge conflict
Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/7a17881a Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/7a17881a Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/7a17881a Branch: refs/heads/master Commit: 7a17881aacb863ecbd4f38169cf18a1e4e63c8a6 Parents: a496252 Author: Jonathan Eagles <[email protected]> Authored: Fri May 19 15:04:29 2017 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri May 19 15:04:29 2017 -0500 ---------------------------------------------------------------------- .../tez/runtime/library/common/shuffle/impl/ShuffleManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/7a17881a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java index 81fac38..10812dc 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/impl/ShuffleManager.java @@ -485,7 +485,7 @@ public class ShuffleManager implements FetcherCallback { if (inputHost.getNumPendingPartitions() > 0) { pendingHosts.add(inputHost); //add it to queue } - for(InputAttemptIdentifier input : pendingInputsOfOnePartition.getInputs()) { + for(InputAttemptIdentifier input : pendingInputsOfOnePartitionRange.getInputs()) { ShuffleEventInfo eventInfo = shuffleInfoEventsMap.get(input.getInputIdentifier()); if (eventInfo != null) { eventInfo.scheduledForDownload = true;
