Repository: tez
Updated Branches:
refs/heads/branch-0.8 7911618c2 -> 829883343
TEZ-3097. Flaky test: TestCommit.testDAGCommitStartedEventFail_OnDAGSuccess.
(Harish Jaiprakash via jlowe)
(cherry picked from commit a2f8cc3d95e5cf8d28ae35b35cc6ca82e45a5996)
Conflicts:
CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/82988334
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/82988334
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/82988334
Branch: refs/heads/branch-0.8
Commit: 82988334342e76ccaafab64a6c82e15b8e454e66
Parents: 7911618
Author: Jason Lowe <[email protected]>
Authored: Fri Oct 28 19:10:38 2016 +0000
Committer: Jason Lowe <[email protected]>
Committed: Fri Oct 28 19:10:38 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../java/org/apache/tez/dag/app/dag/impl/TestCommit.java | 9 ++++-----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/82988334/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b721230..5f1808e 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-3483. Create basic travis yml file for Tez.
TEZ-3437. Improve synchronization and the progress report behavior for
Inputs from TEZ-3317.
http://git-wip-us.apache.org/repos/asf/tez/blob/82988334/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 d3b474c..e07738b 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
