You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by jl...@apache.org on 2016/10/28 19:09:45 UTC

tez git commit: TEZ-3097. Flaky test: TestCommit.testDAGCommitStartedEventFail_OnDAGSuccess. (Harish Jaiprakash via jlowe)

Repository: tez
Updated Branches:
  refs/heads/master cfd265d20 -> a2f8cc3d9


TEZ-3097. Flaky test: TestCommit.testDAGCommitStartedEventFail_OnDAGSuccess. (Harish Jaiprakash via jlowe)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/a2f8cc3d
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/a2f8cc3d
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/a2f8cc3d

Branch: refs/heads/master
Commit: a2f8cc3d95e5cf8d28ae35b35cc6ca82e45a5996
Parents: cfd265d
Author: Jason Lowe <jl...@apache.org>
Authored: Fri Oct 28 19:08:59 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Fri Oct 28 19:08:59 2016 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                 | 2 ++
 .../java/org/apache/tez/dag/app/dag/impl/TestCommit.java    | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/a2f8cc3d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 970700b..83e0b59 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3097. Flaky test: TestCommit.testDAGCommitStartedEventFail_OnDAGSuccess.
   TEZ-3487. Improvements in travis yml file to get builds to work.
   TEZ-3405. Support ability for AM to kill itself if there is no client heartbeating to it.
   TEZ-3483. Create basic travis yml file for Tez.
@@ -134,6 +135,7 @@ INCOMPATIBLE CHANGES
 
 ALL CHANGES:
 
+  TEZ-3097. Flaky test: TestCommit.testDAGCommitStartedEventFail_OnDAGSuccess.
   TEZ-3437. Improve synchronization and the progress report behavior for Inputs from TEZ-3317.
   TEZ-3317. Speculative execution starts too early due to 0 progress.
   TEZ-3452. Auto-reduce parallelism calculation can overflow with large inputs

http://git-wip-us.apache.org/repos/asf/tez/blob/a2f8cc3d/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestCommit.java
----------------------------------------------------------------------
diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestCommit.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestCommit.java
index 5b9a8da..7611f1c 100644
--- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestCommit.java
+++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestCommit.java
@@ -27,10 +27,10 @@ import java.io.DataOutput;
 import java.io.DataOutputStream;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
+import java.util.Queue;
 import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -295,7 +295,6 @@ public class TestCommit {
     }
   }
 
-  @SuppressWarnings({ "unchecked", "rawtypes" })
   public void setupDAG(DAGPlan dagPlan) {
     conf.setBoolean(TezConfiguration.TEZ_AM_CONTAINER_REUSE_ENABLED, false);
     appAttemptId = ApplicationAttemptId.newInstance(
@@ -2023,11 +2022,11 @@ public class TestCommit {
 
     public boolean failVertexGroupCommitFinishedEvent = false;
     public boolean failDAGCommitStartedEvent = false;
-    public List<HistoryEvent> historyEvents = new ArrayList<HistoryEvent>();
+    public Queue<HistoryEvent> historyEvents = new ConcurrentLinkedQueue<HistoryEvent>();
     public MockHistoryEventHandler(AppContext context) {
       super(context);
     }
-    
+
     @Override
     public void handleCriticalEvent(DAGHistoryEvent event) throws IOException {
       if (event.getHistoryEvent().getEventType() == HistoryEventType.VERTEX_GROUP_COMMIT_FINISHED