You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/06/05 13:47:27 UTC
[1/2] flink git commit: [tests] Increase timeouts for process failure
tests in order to compensate for volatile CI environments (Travis)
Repository: flink
Updated Branches:
refs/heads/master 0d00836ae -> 4b9e34047
[tests] Increase timeouts for process failure tests in order to compensate for volatile CI environments (Travis)
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/4b9e3404
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/4b9e3404
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/4b9e3404
Branch: refs/heads/master
Commit: 4b9e34047095da2e6a9425f67462409033a3cf14
Parents: 17cb647
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Jun 5 11:30:30 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Jun 5 13:46:49 2015 +0200
----------------------------------------------------------------------
.../recovery/AbstractProcessFailureRecoveryTest.java | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/4b9e3404/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractProcessFailureRecoveryTest.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractProcessFailureRecoveryTest.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractProcessFailureRecoveryTest.java
index e001fc8..f40877a 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractProcessFailureRecoveryTest.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/AbstractProcessFailureRecoveryTest.java
@@ -139,8 +139,8 @@ public abstract class AbstractProcessFailureRecoveryTest {
new PipeForwarder(taskManagerProcess2.getErrorStream(), processOutput2);
// we wait for the JobManager to have the two TaskManagers available
- // wait for at most 20 seconds
- waitUntilNumTaskManagersAreRegistered(jmActor, 2, 30000);
+ // since some of the CI environments are very hostile, we need to give this a lot of time (2 minutes)
+ waitUntilNumTaskManagersAreRegistered(jmActor, 2, 120000);
// the program will set a marker file in each of its parallel tasks once they are ready, so that
// this coordinating code is aware of this.
@@ -174,8 +174,9 @@ public abstract class AbstractProcessFailureRecoveryTest {
taskManagerProcess3 = new ProcessBuilder(command).start();
new PipeForwarder(taskManagerProcess3.getErrorStream(), processOutput3);
- // we wait for the third TaskManager to register (20 seconds max)
- waitUntilNumTaskManagersAreRegistered(jmActor, 3, 30000);
+ // we wait for the third TaskManager to register
+ // since some of the CI environments are very hostile, we need to give this a lot of time (2 minutes)
+ waitUntilNumTaskManagersAreRegistered(jmActor, 3, 120000);
// kill one of the previous TaskManagers, triggering a failure and recovery
taskManagerProcess1.destroy();
@@ -184,8 +185,8 @@ public abstract class AbstractProcessFailureRecoveryTest {
// we create the marker file which signals the program functions tasks that they can complete
touchFile(new File(coordinateTempDir, PROCEED_MARKER_FILE));
- // wait for at most 2 minutes for the program to complete
- programTrigger.join(120000);
+ // wait for at most 5 minutes for the program to complete
+ programTrigger.join(300000);
// check that the program really finished
assertFalse("The program did not finish in time", programTrigger.isAlive());
[2/2] flink git commit: [FLINK-1892] [tez] Bump Tez dependency to
0.6.1 from 0.6.0 to include tez bugfixes
Posted by se...@apache.org.
[FLINK-1892] [tez] Bump Tez dependency to 0.6.1 from 0.6.0 to include tez bugfixes
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/17cb647b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/17cb647b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/17cb647b
Branch: refs/heads/master
Commit: 17cb647b56bbd39777c4b38d481bd532757c932f
Parents: 0d00836
Author: Stephan Ewen <se...@apache.org>
Authored: Fri Jun 5 11:13:35 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Jun 5 13:46:49 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/17cb647b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 30aabfb..11a9ed1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@ under the License.
<protobuf.version>2.5.0</protobuf.version>
<chill.version>0.5.2</chill.version>
<asm.version>5.0.3</asm.version>
- <tez.version>0.6.0</tez.version>
+ <tez.version>0.6.1</tez.version>
</properties>
<dependencies>