You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by zj...@apache.org on 2015/01/16 02:48:03 UTC
tez git commit: TEZ-1934. TestAMRecovery may fail due to the
execution order is not determined. (zjffdu)
Repository: tez
Updated Branches:
refs/heads/master 2544b05b7 -> 880d4f38f
TEZ-1934. TestAMRecovery may fail due to the execution order is not determined. (zjffdu)
Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/880d4f38
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/880d4f38
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/880d4f38
Branch: refs/heads/master
Commit: 880d4f38f4ccb2de987a7c9ca4cbbbe67b0a833e
Parents: 2544b05
Author: Jeff Zhang <zj...@apache.org>
Authored: Fri Jan 16 09:47:46 2015 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Fri Jan 16 09:47:46 2015 +0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../java/org/apache/tez/test/TestAMRecovery.java | 18 ++++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tez/blob/880d4f38/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4848835..7310686 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,6 +7,7 @@ Release 0.7.0: Unreleased
INCOMPATIBLE CHANGES
ALL CHANGES:
+ TEZ-1934. TestAMRecovery may fail due to the execution order is not determined.
TEZ-1951. Fix general findbugs warnings in tez-dag.
TEZ-1905. Fix findbugs warnings in tez-tests.
TEZ-1945. Remove 2 GB memlimit restriction in MergeManager.
http://git-wip-us.apache.org/repos/asf/tez/blob/880d4f38/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
index 8c3eff4..b8195a4 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestAMRecovery.java
@@ -491,6 +491,7 @@ public class TestAMRecovery {
InputReadyVertexManager {
private Configuration conf;
+ private int completedTaskNum = 0;
public ControlledInputReadyVertexManager(VertexManagerPluginContext context) {
super(context);
@@ -510,13 +511,14 @@ public class TestAMRecovery {
@Override
public void onSourceTaskCompleted(String srcVertexName, Integer taskId) {
super.onSourceTaskCompleted(srcVertexName, taskId);
+ completedTaskNum ++;
if (getContext().getDAGAttemptNumber() == 1) {
if (conf.getBoolean(FAIL_ON_PARTIAL_FINISHED, true)) {
- if (taskId.intValue() == 0) {
+ if (completedTaskNum == 1) {
System.exit(-1);
}
} else {
- if (taskId.intValue() == 1) {
+ if (completedTaskNum == getContext().getVertexNumTasks(srcVertexName)) {
System.exit(-1);
}
}
@@ -528,6 +530,7 @@ public class TestAMRecovery {
ShuffleVertexManager {
private Configuration conf;
+ private int completedTaskNum = 0;
public ControlledShuffleVertexManager(VertexManagerPluginContext context) {
super(context);
@@ -547,13 +550,14 @@ public class TestAMRecovery {
@Override
public void onSourceTaskCompleted(String srcVertexName, Integer taskId) {
super.onSourceTaskCompleted(srcVertexName, taskId);
+ completedTaskNum ++;
if (getContext().getDAGAttemptNumber() == 1) {
if (conf.getBoolean(FAIL_ON_PARTIAL_FINISHED, true)) {
- if (taskId.intValue() == 0) {
+ if (completedTaskNum == 1) {
System.exit(-1);
}
} else {
- if (taskId.intValue() == 1) {
+ if (completedTaskNum == getContext().getVertexNumTasks(srcVertexName)) {
System.exit(-1);
}
}
@@ -565,6 +569,7 @@ public class TestAMRecovery {
ImmediateStartVertexManager {
private Configuration conf;
+ private int completedTaskNum = 0;
public ControlledImmediateStartVertexManager(
VertexManagerPluginContext context) {
@@ -585,13 +590,14 @@ public class TestAMRecovery {
@Override
public void onSourceTaskCompleted(String srcVertexName, Integer taskId) {
super.onSourceTaskCompleted(srcVertexName, taskId);
+ completedTaskNum ++;
if (getContext().getDAGAttemptNumber() == 1) {
if (conf.getBoolean(FAIL_ON_PARTIAL_FINISHED, true)) {
- if (taskId.intValue() == 0) {
+ if (completedTaskNum == 1) {
System.exit(-1);
}
} else {
- if (taskId.intValue() == 1) {
+ if (completedTaskNum == getContext().getVertexNumTasks(srcVertexName)) {
System.exit(-1);
}
}