flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject flink git commit: [FLINK-4056] [tests] Harden SavepointITCase
Date Fri, 17 Jun 2016 11:40:55 GMT
Repository: flink
Updated Branches:
  refs/heads/release-1.0 53dac6363 -> 14525ae18


[FLINK-4056] [tests] Harden SavepointITCase

Trying to prevent failures like [1] from happening again. I could not
explain who deleted the savepoint file concurrently with the exists
check. The savepoint is triggered and retrieved successfully. Shutting
down the cluster does not remove any savepoints.

[1] https://s3.amazonaws.com/archive.travis-ci.org/jobs/136396433/log.txt


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/14525ae1
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/14525ae1
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/14525ae1

Branch: refs/heads/release-1.0
Commit: 14525ae18579081d4edaf01be115ca22987eaa0f
Parents: 53dac63
Author: Ufuk Celebi <uce@apache.org>
Authored: Thu Jun 16 15:32:24 2016 +0200
Committer: Ufuk Celebi <uce@apache.org>
Committed: Fri Jun 17 13:40:43 2016 +0200

----------------------------------------------------------------------
 .../flink/test/checkpointing/SavepointITCase.java      | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/14525ae1/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
index 5386353..c5111f7 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
@@ -61,7 +61,10 @@ import org.apache.flink.streaming.api.functions.source.SourceFunction;
 import org.apache.flink.streaming.runtime.tasks.StreamTaskState;
 import org.apache.flink.streaming.runtime.tasks.StreamTaskStateList;
 import org.apache.flink.test.util.ForkableFlinkMiniCluster;
+import org.apache.flink.testutils.junit.RetryOnFailure;
+import org.apache.flink.testutils.junit.RetryRule;
 import org.apache.flink.util.TestLogger;
+import org.junit.Rule;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -71,6 +74,7 @@ import scala.concurrent.duration.Deadline;
 import scala.concurrent.duration.FiniteDuration;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -95,6 +99,9 @@ public class SavepointITCase extends TestLogger {
 
 	private static final Logger LOG = LoggerFactory.getLogger(SavepointITCase.class);
 
+	@Rule
+	public RetryRule retryRule = new RetryRule();
+
 	/**
 	 * Tests that it is possible to submit a job, trigger a savepoint, and
 	 * later restart the job on a new cluster. The savepoint is written to
@@ -396,6 +403,7 @@ public class SavepointITCase extends TestLogger {
 	 * a proper Exception on submission.
 	 */
 	@Test
+	@RetryOnFailure(times = 2)
 	public void testCheckpointHasBeenRemoved() throws Exception {
 		// Config
 		int numTaskManagers = 2;
@@ -500,7 +508,10 @@ public class SavepointITCase extends TestLogger {
 			flink.shutdown();
 
 			// Remove the checkpoint files
-			FileUtils.deleteDirectory(checkpointDir);
+			try {
+				FileUtils.deleteDirectory(checkpointDir);
+			} catch (FileNotFoundException ignored) {
+			}
 
 			// Restart the cluster
 			LOG.info("Restarting Flink cluster.");


Mime
View raw message