Repository: flink Updated Branches: refs/heads/master 76968c636 -> 138dc8fef
[FLINK-3619] [runtime] Increase timeout in SavepointCoordinatorTest - Timeout of 5s seems to be too aggressive for some Travis runs [1] [1] https://s3.amazonaws.com/archive.travis-ci.org/jobs/120105003/log.txt Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/138dc8fe Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/138dc8fe Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/138dc8fe Branch: refs/heads/master Commit: 138dc8fef72bad644ce7e507714d9809043004b6 Parents: 76968c6 Author: Ufuk Celebi <[email protected]> Authored: Mon Apr 4 14:41:18 2016 +0200 Committer: Ufuk Celebi <[email protected]> Committed: Mon Apr 4 17:52:45 2016 +0200 ---------------------------------------------------------------------- .../checkpoint/SavepointCoordinatorTest.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/138dc8fe/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorTest.java ---------------------------------------------------------------------- diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorTest.java index b3bdd9f..f334a90 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/checkpoint/SavepointCoordinatorTest.java @@ -34,6 +34,7 @@ import org.apache.flink.runtime.state.LocalStateHandle; import org.apache.flink.runtime.state.StateHandle; import org.apache.flink.runtime.testutils.CommonTestUtils; import org.apache.flink.util.SerializedValue; +import org.apache.flink.util.TestLogger; import org.junit.Test; import scala.concurrent.Await; import scala.concurrent.Future; @@ -70,7 +71,7 @@ import static org.mockito.Mockito.when; /** * Tests for the savepoint coordinator. */ -public class SavepointCoordinatorTest { +public class SavepointCoordinatorTest extends TestLogger { // ------------------------------------------------------------------------ // Trigger and acknowledge @@ -478,9 +479,10 @@ public class SavepointCoordinatorTest { ExecutionVertex commitVertex = mockExecutionVertex(jobId); MockCheckpointIdCounter checkpointIdCounter = new MockCheckpointIdCounter(); + long checkpointTimeout = 1000; SavepointCoordinator coordinator = createSavepointCoordinator( jobId, - 20, + checkpointTimeout, vertices, vertices, new ExecutionVertex[] { commitVertex }, @@ -492,19 +494,14 @@ public class SavepointCoordinatorTest { assertFalse(savepointPathFuture.isCompleted()); long checkpointId = checkpointIdCounter.getLastReturnedCount(); - - // Acknowledge single task - coordinator.receiveAcknowledgeMessage(new AcknowledgeCheckpoint( - jobId, vertices[0].getCurrentExecutionAttempt().getAttemptId(), - checkpointId, createSerializedStateHandle(vertices[0]), 0)); - PendingCheckpoint pendingCheckpoint = coordinator.getPendingCheckpoints() .get(checkpointId); - assertFalse(pendingCheckpoint.isDiscarded()); + assertNotNull("Checkpoint not pending (test race)", pendingCheckpoint); + assertFalse("Checkpoint already discarded (test race)", pendingCheckpoint.isDiscarded()); // Wait for savepoint to timeout - Deadline deadline = FiniteDuration.apply(5, "s").fromNow(); + Deadline deadline = FiniteDuration.apply(60, "s").fromNow(); while (deadline.hasTimeLeft() && !pendingCheckpoint.isDiscarded() && coordinator.getNumberOfPendingCheckpoints() > 0) { @@ -513,7 +510,7 @@ public class SavepointCoordinatorTest { } // Verify discarded - assertTrue(pendingCheckpoint.isDiscarded()); + assertTrue("Savepoint not discarded within timeout", pendingCheckpoint.isDiscarded()); assertEquals(0, coordinator.getNumberOfPendingCheckpoints()); assertEquals(0, coordinator.getNumberOfRetainedSuccessfulCheckpoints());
