You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by al...@apache.org on 2015/04/24 16:16:34 UTC
flink git commit: [FLINK-1867/1880] Raise test timeouts in hope of
fixing Travis fails
Repository: flink
Updated Branches:
refs/heads/master 046f39ea4 -> b2aafe585
[FLINK-1867/1880] Raise test timeouts in hope of fixing Travis fails
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b2aafe58
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b2aafe58
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b2aafe58
Branch: refs/heads/master
Commit: b2aafe585303e9eceb57ae1ac0b1d552206e3b3a
Parents: 046f39e
Author: Aljoscha Krettek <al...@gmail.com>
Authored: Mon Apr 13 16:16:51 2015 +0200
Committer: Aljoscha Krettek <al...@gmail.com>
Committed: Fri Apr 24 16:16:00 2015 +0200
----------------------------------------------------------------------
.../JobManagerProcessReapingTest.java | 2 +-
.../TaskManagerProcessReapingTest.java | 2 +-
.../runtime/taskmanager/TaskManagerTest.java | 12 +++++-----
.../AbstractProcessFailureRecoveryTest.java | 6 ++---
.../TaskManagerFailureRecoveryITCase.java | 4 ++--
.../jobmanager/JobManagerFailsITCase.scala | 23 +++++++-------------
.../taskmanager/TaskManagerFailsITCase.scala | 4 ----
7 files changed, 21 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
index eee945a..a332ee1 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/jobmanager/JobManagerProcessReapingTest.java
@@ -102,7 +102,7 @@ public class JobManagerProcessReapingTest {
try {
jobManagerRef = JobManager.getJobManagerRemoteReference(
new InetSocketAddress("localhost", jobManagerPort),
- localSystem, new FiniteDuration(5, TimeUnit.SECONDS));
+ localSystem, new FiniteDuration(25, TimeUnit.SECONDS));
break;
}
catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTest.java
index 3e65916..91fadca 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerProcessReapingTest.java
@@ -113,7 +113,7 @@ public class TaskManagerProcessReapingTest {
for (int i = 0; i < 40; i++) {
try {
taskManagerRef = TaskManager.getTaskManagerRemoteReference(
- taskManagerActorName, jmActorSystem, new FiniteDuration(5, TimeUnit.SECONDS));
+ taskManagerActorName, jmActorSystem, new FiniteDuration(25, TimeUnit.SECONDS));
break;
}
catch (Throwable t) {
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
index 760b14e..8b7915f 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/taskmanager/TaskManagerTest.java
@@ -115,7 +115,7 @@ public class TaskManagerTest {
new ArrayList<BlobKey>(), 0);
final ActorRef tmClosure = taskManager;
- new Within(duration("2 seconds")) {
+ new Within(duration("10 seconds")) {
@Override
protected void run() {
@@ -172,7 +172,7 @@ public class TaskManagerTest {
new ArrayList<BlobKey>(), 0);
final ActorRef tm = taskManager;
- final FiniteDuration d = duration("1 second");
+ final FiniteDuration d = duration("10 second");
new Within(d) {
@@ -288,7 +288,7 @@ public class TaskManagerTest {
Collections.<InputGateDeploymentDescriptor>emptyList(),
new ArrayList<BlobKey>(), 0);
- new Within(duration("1 second")){
+ new Within(duration("10 second")){
@Override
protected void run() {
@@ -378,7 +378,7 @@ public class TaskManagerTest {
Collections.singletonList(ircdd),
new ArrayList<BlobKey>(), 0);
- final FiniteDuration d = duration("1 second");
+ final FiniteDuration d = duration("10 second");
new Within(d) {
@@ -488,7 +488,7 @@ public class TaskManagerTest {
Collections.singletonList(ircdd),
new ArrayList<BlobKey>(), 0);
- final FiniteDuration d = duration("1 second");
+ final FiniteDuration d = duration("10 second");
new Within(d){
@@ -637,7 +637,7 @@ public class TaskManagerTest {
TaskManagerMessages.getNotifyWhenRegisteredAtJobManagerMessage(), timeout);
try {
- FiniteDuration d = new FiniteDuration(20, TimeUnit.SECONDS);
+ FiniteDuration d = new FiniteDuration(100, TimeUnit.SECONDS);
Await.ready(response, d);
}
catch (Exception e) {
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/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 c102c1f..555b904 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
@@ -112,9 +112,9 @@ public abstract class AbstractProcessFailureRecoveryTest {
Tuple2<String, Object> localAddress = new Tuple2<String, Object>("localhost", jobManagerPort);
Configuration jmConfig = new Configuration();
- jmConfig.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_INTERVAL, "1 s");
- jmConfig.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "4 s");
- jmConfig.setInteger(ConfigConstants.AKKA_WATCH_THRESHOLD, 2);
+ jmConfig.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_INTERVAL, "1000 ms");
+ jmConfig.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "2 s");
+ jmConfig.setInteger(ConfigConstants.AKKA_WATCH_THRESHOLD, 7);
jmConfig.setString(ConfigConstants.DEFAULT_EXECUTION_RETRY_DELAY_KEY, "4 s");
jmActorSystem = AkkaUtils.createActorSystem(jmConfig, new Some<Tuple2<String, Object>>(localAddress));
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
index 1c9f798..361621b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/recovery/TaskManagerFailureRecoveryITCase.java
@@ -74,8 +74,8 @@ public class TaskManagerFailureRecoveryITCase {
config.setInteger(ConfigConstants.TASK_MANAGER_MEMORY_SIZE_KEY, 16);
config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_INTERVAL, "500 ms");
- config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "2 s");
- config.setInteger(ConfigConstants.AKKA_WATCH_THRESHOLD, 2);
+ config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "20 s");
+ config.setInteger(ConfigConstants.AKKA_WATCH_THRESHOLD, 20);
cluster = new ForkableFlinkMiniCluster(config, false);
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/jobmanager/JobManagerFailsITCase.scala
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/jobmanager/JobManagerFailsITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/jobmanager/JobManagerFailsITCase.scala
index 3e17225..ca8dd75 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/jobmanager/JobManagerFailsITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/jobmanager/JobManagerFailsITCase.scala
@@ -18,26 +18,23 @@
package org.apache.flink.api.scala.runtime.jobmanager
-import akka.actor.Status.{Success, Failure}
+import akka.actor.Status.Success
import akka.actor.{ActorSystem, PoisonPill}
import akka.testkit.{ImplicitSender, TestKit}
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
+
import org.apache.flink.configuration.{ConfigConstants, Configuration}
import org.apache.flink.runtime.akka.AkkaUtils
-import org.apache.flink.runtime.client.JobExecutionException
-import org.apache.flink.runtime.jobgraph.{JobGraph, AbstractJobVertex}
-import org.apache.flink.runtime.jobmanager.Tasks.{NoOpInvokable, BlockingNoOpInvokable}
+import org.apache.flink.runtime.jobgraph.{AbstractJobVertex, JobGraph}
+import org.apache.flink.runtime.jobmanager.Tasks.{BlockingNoOpInvokable, NoOpInvokable}
import org.apache.flink.runtime.messages.JobManagerMessages._
import org.apache.flink.runtime.testingUtils.TestingMessages.DisableDisconnect
-import org.apache.flink.runtime.testingUtils.TestingTaskManagerMessages.{JobManagerTerminated,
-NotifyWhenJobManagerTerminated}
+import org.apache.flink.runtime.testingUtils.TestingTaskManagerMessages.{JobManagerTerminated, NotifyWhenJobManagerTerminated}
import org.apache.flink.runtime.testingUtils.TestingUtils
import org.apache.flink.test.util.ForkableFlinkMiniCluster
-import org.junit.Ignore
-import org.junit.runner.RunWith
-import org.scalatest.junit.JUnitRunner
-import org.scalatest.{BeforeAndAfterAll, Matchers, WordSpecLike}
-@Ignore("Contains a bug with Akka 2.2.1")
@RunWith(classOf[JUnitRunner])
class JobManagerFailsITCase(_system: ActorSystem) extends TestKit(_system) with ImplicitSender
with WordSpecLike with Matchers with BeforeAndAfterAll {
@@ -135,10 +132,6 @@ with WordSpecLike with Matchers with BeforeAndAfterAll {
val config = new Configuration()
config.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, numSlots)
config.setInteger(ConfigConstants.LOCAL_INSTANCE_MANAGER_NUMBER_TASK_MANAGER, numTaskmanagers)
- config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_INTERVAL, "1000 ms")
- config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "4000 ms")
- config.setString(ConfigConstants.DEFAULT_EXECUTION_RETRY_DELAY_KEY, "8000 ms")
- config.setDouble(ConfigConstants.AKKA_WATCH_THRESHOLD, 5)
new ForkableFlinkMiniCluster(config, singleActorSystem = false)
}
http://git-wip-us.apache.org/repos/asf/flink/blob/b2aafe58/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/taskmanager/TaskManagerFailsITCase.scala
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/taskmanager/TaskManagerFailsITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/taskmanager/TaskManagerFailsITCase.scala
index 0b6c981..07eaed7 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/taskmanager/TaskManagerFailsITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/runtime/taskmanager/TaskManagerFailsITCase.scala
@@ -230,10 +230,6 @@ with WordSpecLike with Matchers with BeforeAndAfterAll {
val config = new Configuration()
config.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, numSlots)
config.setInteger(ConfigConstants.LOCAL_INSTANCE_MANAGER_NUMBER_TASK_MANAGER, numTaskmanagers)
- config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_INTERVAL, "1000 ms")
- config.setString(ConfigConstants.AKKA_WATCH_HEARTBEAT_PAUSE, "4000 ms")
- config.setString(ConfigConstants.DEFAULT_EXECUTION_RETRY_DELAY_KEY, "4000 ms")
- config.setDouble(ConfigConstants.AKKA_WATCH_THRESHOLD, 5)
new ForkableFlinkMiniCluster(config, singleActorSystem = false)
}