TEZ-3245. Data race between addKnowInput and clearAndGetOnepartition …

…of InputHost. (Zhiyuan Yang via hitesh)
appcoreopc · May 9, 2016 · eceb7ac · eceb7ac
1 parent c3b8b85
commit eceb7ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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.

diff --git a/...untime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java b/...untime-library/src/main/java/org/apache/tez/runtime/library/common/shuffle/InputHost.java
@@ -57,7 +57,7 @@ public int getNumPendingPartitions() {
     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 void addKnownInput(Integer partition,
     inputs.add(srcAttempt);
   }
 
-  public PartitionToInputs clearAndGetOnePartition() {
+  public synchronized PartitionToInputs clearAndGetOnePartition() {
     for (Map.Entry<Integer, BlockingQueue<InputAttemptIdentifier>> entry :
         partitionToInputs.entrySet()) {
       List<InputAttemptIdentifier> inputs =