Repository: tez Updated Branches: refs/heads/master c3b8b8523 -> eceb7acf5
TEZ-3245. Data race between addKnowInput and clearAndGetOnepartition of InputHost. (Zhiyuan Yang via hitesh) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/eceb7acf Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/eceb7acf Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/eceb7acf Branch: refs/heads/master Commit: eceb7acf59942661c16a58f0f6d3c649ea149a82 Parents: c3b8b85 Author: Hitesh Shah <[email protected]> Authored: Mon May 9 14:09:29 2016 -0700 Committer: Hitesh Shah <[email protected]> Committed: Mon May 9 14:09:29 2016 -0700 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/tez/runtime/library/common/shuffle/InputHost.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/eceb7acf/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 37d47cf..39e53d9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -6,6 +6,7 @@ Release 0.9.0: Unreleased INCOMPATIBLE CHANGES ALL CHANGES: + TEZ-3245. Data race between addKnowInput and clearAndGetOnepartition of InputHost. TEZ-3193. Deadlock in AM during task commit request. TEZ-3203. DAG hangs when one of the upstream vertices has zero tasks TEZ-3207. Add support for fetching multiple partitions from the same source task to UnorderedKVInput. http://git-wip-us.apache.org/repos/asf/tez/blob/eceb7acf/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java ---------------------------------------------------------------------- diff --git a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java index a447d83..969e06c 100644 --- a/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java +++ b/tez-runtime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java @@ -57,7 +57,7 @@ public class InputHost extends HostPort { return partitionToInputs.size(); } - public void addKnownInput(Integer partition, + public synchronized void addKnownInput(Integer partition, InputAttemptIdentifier srcAttempt) { BlockingQueue<InputAttemptIdentifier> inputs = partitionToInputs.get(partition); @@ -68,7 +68,7 @@ public class InputHost extends HostPort { inputs.add(srcAttempt); } - public PartitionToInputs clearAndGetOnePartition() { + public synchronized PartitionToInputs clearAndGetOnePartition() { for (Map.Entry<Integer, BlockingQueue<InputAttemptIdentifier>> entry : partitionToInputs.entrySet()) { List<InputAttemptIdentifier> inputs =
