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/07/09 12:35:44 UTC
[1/2] flink git commit: [hotfix] [tests] Increase registration
timeout for TaskManagers in ProcessFailureCancelingITCase to compensate for
sloggy CI environments
Repository: flink
Updated Branches:
refs/heads/master 7ce05ad57 -> c7ec74e45
[hotfix] [tests] Increase registration timeout for TaskManagers in ProcessFailureCancelingITCase to compensate for sloggy CI environments
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c98191c5
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c98191c5
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c98191c5
Branch: refs/heads/master
Commit: c98191c52ce8589352596305553b22218e2e383e
Parents: 7ce05ad
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Jul 9 12:11:11 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Jul 9 12:11:11 2015 +0200
----------------------------------------------------------------------
.../flink/test/recovery/ProcessFailureCancelingITCase.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c98191c5/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
index 706d197..f1745ee 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/ProcessFailureCancelingITCase.java
@@ -118,8 +118,8 @@ public class ProcessFailureCancelingITCase {
new AbstractProcessFailureRecoveryTest.PipeForwarder(taskManagerProcess.getErrorStream(), processOutput);
// we wait for the JobManager to have the two TaskManagers available
- // wait for at most 30 seconds
- waitUntilNumTaskManagersAreRegistered(jmActor, 1, 30000);
+ // since some of the CI environments are very hostile, we need to give this a lot of time (2 minutes)
+ waitUntilNumTaskManagersAreRegistered(jmActor, 1, 120000);
final Throwable[] errorRef = new Throwable[1];
[2/2] flink git commit: [hotfix] [taskmanager] Fix line wrapping to
please scala checkstyle
Posted by se...@apache.org.
[hotfix] [taskmanager] Fix line wrapping to please scala checkstyle
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c7ec74e4
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c7ec74e4
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c7ec74e4
Branch: refs/heads/master
Commit: c7ec74e45e08c16b454b16fddfa4e016ebaf092a
Parents: c98191c
Author: Stephan Ewen <se...@apache.org>
Authored: Thu Jul 9 12:34:49 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Jul 9 12:34:49 2015 +0200
----------------------------------------------------------------------
.../scala/org/apache/flink/runtime/taskmanager/TaskManager.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c7ec74e4/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
index 273e072..8c816a1 100644
--- a/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
+++ b/flink-runtime/src/main/scala/org/apache/flink/runtime/taskmanager/TaskManager.scala
@@ -1177,8 +1177,8 @@ object TaskManager {
LOG.info("Trying to select the network interface and address to use " +
"by connecting to the configured JobManager.")
- LOG.info(s"TaskManager will try to connect for $MAX_STARTUP_CONNECT_TIME milliseconds before " +
- "falling back to heuristics")
+ LOG.info(s"TaskManager will try to connect for $MAX_STARTUP_CONNECT_TIME milliseconds " +
+ s"before falling back to heuristics")
val jobManagerAddress = new InetSocketAddress(jobManagerHostname, jobManagerPort)
val taskManagerAddress = try {