This is an automated email from the ASF dual-hosted git repository. sewen pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 8caea1a8f16a35217c343d867d2b45addc9a0abe Author: Jiayi <[email protected]> AuthorDate: Sun Oct 20 18:31:18 2019 +0800 [FLINK-14454][tests] Re-enable SavepointSerializers.setFailWhenLegacyStateDetected after tests This closes #9944 --- .../checkpointing/utils/SavepointMigrationTestBase.java | 17 ++++++++++++----- .../restore/AbstractOperatorRestoreTestBase.java | 6 ++++++ 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java index d549c39..eac68b1 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/SavepointMigrationTestBase.java @@ -40,6 +40,7 @@ import org.apache.flink.test.util.TestBaseUtils; import org.apache.flink.testutils.junit.category.AlsoRunWithLegacyScheduler; import org.apache.commons.io.FileUtils; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; import org.junit.Rule; @@ -66,11 +67,6 @@ import static org.junit.Assert.fail; @Category(AlsoRunWithLegacyScheduler.class) public abstract class SavepointMigrationTestBase extends TestBaseUtils { - @BeforeClass - public static void before() { - SavepointSerializers.setFailWhenLegacyStateDetected(false); - } - @ClassRule public static final TemporaryFolder TEMP_FOLDER = new TemporaryFolder(); @@ -78,8 +74,19 @@ public abstract class SavepointMigrationTestBase extends TestBaseUtils { public final MiniClusterWithClientResource miniClusterResource; private static final Logger LOG = LoggerFactory.getLogger(SavepointMigrationTestBase.class); + protected static final int DEFAULT_PARALLELISM = 4; + @BeforeClass + public static void before() { + SavepointSerializers.setFailWhenLegacyStateDetected(false); + } + + @AfterClass + public static void after() { + SavepointSerializers.setFailWhenLegacyStateDetected(true); + } + protected static String getResourceFilename(String filename) { ClassLoader cl = SavepointMigrationTestBase.class.getClassLoader(); URL resource = cl.getResource(filename); diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java index 3035c7d..9b00d49 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/AbstractOperatorRestoreTestBase.java @@ -41,6 +41,7 @@ import org.apache.flink.testutils.junit.category.AlsoRunWithLegacyScheduler; import org.apache.flink.util.ExceptionUtils; import org.apache.flink.util.TestLogger; +import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Rule; import org.junit.Test; @@ -108,6 +109,11 @@ public abstract class AbstractOperatorRestoreTestBase extends TestLogger { SavepointSerializers.setFailWhenLegacyStateDetected(false); } + @AfterClass + public static void after() { + SavepointSerializers.setFailWhenLegacyStateDetected(true); + } + @Test public void testMigrationAndRestore() throws Throwable { ClusterClient<?> clusterClient = cluster.getClusterClient();
