From 6798f54291941300a1c0a57dbf9971d21e3a4422 Mon Sep 17 00:00:00 2001 From: "wenlong.lwl" Date: Tue, 5 Dec 2017 15:16:32 +0800 Subject: [PATCH 1/3] use TemporaryFolder instead of fixed folder in RocksDBAsyncSnapshotTest --- .../state/RocksDBAsyncSnapshotTest.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java index 2ba0494f4b6ee..6a21cae5f3138 100644 --- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java +++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java @@ -25,7 +25,6 @@ import org.apache.flink.api.common.typeutils.base.StringSerializer; import org.apache.flink.api.common.typeutils.base.VoidSerializer; import org.apache.flink.api.java.functions.KeySelector; -import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.core.testutils.OneShotLatch; import org.apache.flink.runtime.checkpoint.CheckpointMetaData; import org.apache.flink.runtime.checkpoint.CheckpointMetrics; @@ -60,7 +59,9 @@ import org.apache.flink.util.TestLogger; import org.junit.Assert; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.modules.junit4.PowerMockRunner; @@ -70,7 +71,6 @@ import java.lang.reflect.Field; import java.util.Arrays; import java.util.Map; -import java.util.UUID; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.RunnableFuture; @@ -95,6 +95,12 @@ @SuppressWarnings("serial") public class RocksDBAsyncSnapshotTest extends TestLogger { + /** + * Temporary fold for test + */ + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + /** * This ensures that asynchronous state handles are actually materialized asynchronously. * @@ -119,7 +125,7 @@ public String getKey(String value) throws Exception { StreamConfig streamConfig = testHarness.getStreamConfig(); - File dbDir = new File(new File(ConfigConstants.DEFAULT_TASK_MANAGER_TMP_PATH, UUID.randomUUID().toString()), "state"); + File dbDir = temporaryFolder.newFolder(); RocksDBStateBackend backend = new RocksDBStateBackend(new MemoryStateBackend()); backend.setDbStoragePath(dbDir.getAbsolutePath()); @@ -225,7 +231,7 @@ public String getKey(String value) throws Exception { StreamConfig streamConfig = testHarness.getStreamConfig(); - File dbDir = new File(new File(ConfigConstants.DEFAULT_TASK_MANAGER_TMP_PATH, UUID.randomUUID().toString()), "state"); + File dbDir = temporaryFolder.newFolder(); BlockingStreamMemoryStateBackend memoryStateBackend = new BlockingStreamMemoryStateBackend(); @@ -333,7 +339,7 @@ public void testCleanupOfSnapshotsInFailureCase() throws Exception { RocksDBStateBackend backend = new RocksDBStateBackend(stateBackend); - backend.setDbStoragePath("file:///tmp/foobar"); + backend.setDbStoragePath("file://" + temporaryFolder.newFolder().getAbsolutePath()); AbstractKeyedStateBackend keyedStateBackend = backend.createKeyedStateBackend( env, From 16348e139c255bb60550f7a7efdf339aa15a178f Mon Sep 17 00:00:00 2001 From: "wenlong.lwl" Date: Tue, 5 Dec 2017 16:19:22 +0800 Subject: [PATCH 2/3] fix code style error --- .../flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java index 6a21cae5f3138..25b9622735d34 100644 --- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java +++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java @@ -96,7 +96,7 @@ public class RocksDBAsyncSnapshotTest extends TestLogger { /** - * Temporary fold for test + * Temporary fold for test. */ @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); From 862b88709b7505bc7ac44a08b3cdad7d05dfe2ee Mon Sep 17 00:00:00 2001 From: "wenlong.lwl" Date: Tue, 5 Dec 2017 23:18:40 +0800 Subject: [PATCH 3/3] address comment --- .../flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java index 25b9622735d34..71c5e77cfa6d7 100644 --- a/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java +++ b/flink-contrib/flink-statebackend-rocksdb/src/test/java/org/apache/flink/contrib/streaming/state/RocksDBAsyncSnapshotTest.java @@ -339,7 +339,7 @@ public void testCleanupOfSnapshotsInFailureCase() throws Exception { RocksDBStateBackend backend = new RocksDBStateBackend(stateBackend); - backend.setDbStoragePath("file://" + temporaryFolder.newFolder().getAbsolutePath()); + backend.setDbStoragePath(temporaryFolder.newFolder().toURI().toString()); AbstractKeyedStateBackend keyedStateBackend = backend.createKeyedStateBackend( env,