Repository: flink Updated Branches: refs/heads/release-1.2 b323f66a6 -> 44f7098d7
[FLINK-5613][query] querying a non-existing key is inconsistent among state backends Querying for a non-existing key for a state that has a default value set currently results in an UnknownKeyOrNamespace exception when the MemoryStateBackend or FsStateBackend is used but results in the default value if RocksDBStateBackend is set. This removes the special handling from the RocksDBStateBackend and makes it consistent with the other two back-ends, i.e. returning null which results in the mentioned UnknownKeyOrNamespace exception. Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/44f7098d Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/44f7098d Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/44f7098d Branch: refs/heads/release-1.2 Commit: 44f7098d74476ab561f38c8ced5f3a0b5f9bd0c2 Parents: 2e175fb Author: Nico Kruber <[email protected]> Authored: Tue Jan 17 14:26:16 2017 +0100 Committer: Robert Metzger <[email protected]> Committed: Tue Jan 24 08:44:08 2017 +0100 ---------------------------------------------------------------------- .../streaming/state/RocksDBValueState.java | 12 -- .../flink/test/query/QueryableStateITCase.java | 160 ++++++++++++++++++- 2 files changed, 153 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/44f7098d/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBValueState.java ---------------------------------------------------------------------- diff --git a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBValueState.java b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBValueState.java index 9563ed8..d8d89ba 100644 --- a/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBValueState.java +++ b/flink-contrib/flink-statebackend-rocksdb/src/main/java/org/apache/flink/contrib/streaming/state/RocksDBValueState.java @@ -23,7 +23,6 @@ import org.apache.flink.api.common.state.ValueStateDescriptor; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.core.memory.DataInputViewStreamWrapper; import org.apache.flink.core.memory.DataOutputViewStreamWrapper; -import org.apache.flink.runtime.query.netty.message.KvStateRequestSerializer; import org.rocksdb.ColumnFamilyHandle; import org.rocksdb.RocksDBException; import org.rocksdb.WriteOptions; @@ -102,15 +101,4 @@ public class RocksDBValueState<K, N, V> throw new RuntimeException("Error while adding data to RocksDB", e); } } - - @Override - public byte[] getSerializedValue(byte[] serializedKeyAndNamespace) throws Exception { - byte[] value = super.getSerializedValue(serializedKeyAndNamespace); - - if (value != null) { - return value; - } else { - return KvStateRequestSerializer.serializeValue(stateDesc.getDefaultValue(), stateDesc.getSerializer()); - } - } } http://git-wip-us.apache.org/repos/asf/flink/blob/44f7098d/flink-tests/src/test/java/org/apache/flink/test/query/QueryableStateITCase.java ---------------------------------------------------------------------- diff --git a/flink-tests/src/test/java/org/apache/flink/test/query/QueryableStateITCase.java b/flink-tests/src/test/java/org/apache/flink/test/query/QueryableStateITCase.java index 327a715..c2df6ae 100644 --- a/flink-tests/src/test/java/org/apache/flink/test/query/QueryableStateITCase.java +++ b/flink-tests/src/test/java/org/apache/flink/test/query/QueryableStateITCase.java @@ -39,6 +39,7 @@ import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.configuration.ConfigConstants; import org.apache.flink.configuration.Configuration; import org.apache.flink.configuration.QueryableStateOptions; +import org.apache.flink.contrib.streaming.state.RocksDBStateBackend; import org.apache.flink.runtime.akka.AkkaUtils; import org.apache.flink.runtime.executiongraph.ExecutionAttemptID; import org.apache.flink.runtime.executiongraph.ExecutionGraph; @@ -50,10 +51,14 @@ import org.apache.flink.runtime.messages.JobManagerMessages.JobFound; import org.apache.flink.runtime.query.KvStateLocation; import org.apache.flink.runtime.query.KvStateMessage; import org.apache.flink.runtime.query.QueryableStateClient; +import org.apache.flink.runtime.query.netty.UnknownKeyOrNamespace; import org.apache.flink.runtime.query.netty.message.KvStateRequestSerializer; +import org.apache.flink.runtime.state.AbstractStateBackend; import org.apache.flink.runtime.state.CheckpointListener; import org.apache.flink.runtime.state.VoidNamespace; import org.apache.flink.runtime.state.VoidNamespaceSerializer; +import org.apache.flink.runtime.state.filesystem.FsStateBackend; +import org.apache.flink.runtime.state.memory.MemoryStateBackend; import org.apache.flink.runtime.testingUtils.TestingCluster; import org.apache.flink.runtime.testingUtils.TestingJobManagerMessages; import org.apache.flink.runtime.testingUtils.TestingTaskManagerMessages; @@ -67,7 +72,9 @@ import org.apache.flink.util.Preconditions; import org.apache.flink.util.TestLogger; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TemporaryFolder; import scala.concurrent.Await; import scala.concurrent.Future; import scala.concurrent.duration.Deadline; @@ -102,6 +109,9 @@ public class QueryableStateITCase extends TestLogger { private final static int NUM_SLOTS_PER_TM = 4; private final static int NUM_SLOTS = NUM_TMS * NUM_SLOTS_PER_TM; + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + /** * Shared between all the test. Make sure to have at least NUM_SLOTS * available after your test finishes, e.g. cancel the job you submitted. @@ -229,7 +239,8 @@ public class QueryableStateITCase extends TestLogger { queryName, key, serializedKey, - QUERY_RETRY_DELAY); + QUERY_RETRY_DELAY, + false); serializedResult.onSuccess(new OnSuccess<byte[]>() { @Override @@ -352,7 +363,8 @@ public class QueryableStateITCase extends TestLogger { queryName, key, serializedKey, - QUERY_RETRY_DELAY); + QUERY_RETRY_DELAY, + false); byte[] serializedResult = Await.result(serializedResultFuture, deadline.timeLeft()); @@ -455,7 +467,8 @@ public class QueryableStateITCase extends TestLogger { queryName, key, serializedKey, - QUERY_RETRY_DELAY); + QUERY_RETRY_DELAY, + false); byte[] serializedResult = Await.result(serializedResultFuture, deadline.timeLeft()); @@ -731,7 +744,8 @@ public class QueryableStateITCase extends TestLogger { queryableState.getQueryableStateName(), key, serializedKey, - QUERY_RETRY_DELAY); + QUERY_RETRY_DELAY, + false); byte[] serializedValue = Await.result(future, deadline.timeLeft()); @@ -753,6 +767,132 @@ public class QueryableStateITCase extends TestLogger { } /** + * Tests simple value state queryable state instance with a default value + * set using the {@link MemoryStateBackend}. + */ + @Test(expected = UnknownKeyOrNamespace.class) + public void testValueStateDefaultValueMemoryBackend() throws Exception { + testValueStateDefault(new MemoryStateBackend()); + } + + /** + * Tests simple value state queryable state instance with a default value + * set using the {@link RocksDBStateBackend}. + */ + @Test(expected = UnknownKeyOrNamespace.class) + public void testValueStateDefaultValueRocksDBBackend() throws Exception { + testValueStateDefault(new RocksDBStateBackend( + temporaryFolder.newFolder().toURI().toString())); + } + + /** + * Tests simple value state queryable state instance with a default value + * set using the {@link FsStateBackend}. + */ + @Test(expected = UnknownKeyOrNamespace.class) + public void testValueStateDefaultValueFsBackend() throws Exception { + testValueStateDefault(new FsStateBackend( + temporaryFolder.newFolder().toURI().toString())); + } + + /** + * Tests simple value state queryable state instance with a default value + * set. Each source emits (subtaskIndex, 0)..(subtaskIndex, numElements) + * tuples, the key is mapped to 1 but key 0 is queried which should throw + * a {@link UnknownKeyOrNamespace} exception. + * + * @param stateBackend state back-end to use for the job + * + * @throws UnknownKeyOrNamespace thrown due querying a non-existent key + */ + void testValueStateDefault(final AbstractStateBackend stateBackend) throws + Exception, UnknownKeyOrNamespace { + + // Config + final Deadline deadline = TEST_TIMEOUT.fromNow(); + + final int numElements = 1024; + + final QueryableStateClient client = new QueryableStateClient(cluster.configuration()); + + JobID jobId = null; + try { + StreamExecutionEnvironment env = + StreamExecutionEnvironment.getExecutionEnvironment(); + env.setParallelism(NUM_SLOTS); + // Very important, because cluster is shared between tests and we + // don't explicitly check that all slots are available before + // submitting. + env.setRestartStrategy(RestartStrategies + .fixedDelayRestart(Integer.MAX_VALUE, 1000)); + + env.setStateBackend(stateBackend); + + DataStream<Tuple2<Integer, Long>> source = env + .addSource(new TestAscendingValueSource(numElements)); + + // Value state + ValueStateDescriptor<Tuple2<Integer, Long>> valueState = + new ValueStateDescriptor<>( + "any", + source.getType(), + Tuple2.of(0, 1337l)); + + // only expose key "1" + QueryableStateStream<Integer, Tuple2<Integer, Long>> + queryableState = + source.keyBy( + new KeySelector<Tuple2<Integer, Long>, Integer>() { + @Override + public Integer getKey( + Tuple2<Integer, Long> value) throws + Exception { + return 1; + } + }).asQueryableState("hakuna", valueState); + + // Submit the job graph + JobGraph jobGraph = env.getStreamGraph().getJobGraph(); + jobId = jobGraph.getJobID(); + + cluster.submitJobDetached(jobGraph); + + // Now query + int key = 0; + final byte[] serializedKey = + KvStateRequestSerializer.serializeKeyAndNamespace( + key, + queryableState.getKeySerializer(), + VoidNamespace.INSTANCE, + VoidNamespaceSerializer.INSTANCE); + + Future<byte[]> future = getKvStateWithRetries(client, + jobId, + queryableState.getQueryableStateName(), + key, + serializedKey, + QUERY_RETRY_DELAY, + true); + + Await.result(future, deadline.timeLeft()); + } finally { + // Free cluster resources + if (jobId != null) { + Future<CancellationSuccess> cancellation = cluster + .getLeaderGateway(deadline.timeLeft()) + .ask(new JobManagerMessages.CancelJob(jobId), + deadline.timeLeft()) + .mapTo(ClassTag$.MODULE$.<CancellationSuccess>apply( + CancellationSuccess.class)); + + Await.ready(cancellation, deadline.timeLeft()); + } + + client.shutDown(); + } + } + + /** * Tests simple value state queryable state instance. Each source emits * (subtaskIndex, 0)..(subtaskIndex, numElements) tuples, which are then * queried. The tests succeeds after each subtask index is queried with @@ -883,7 +1023,8 @@ public class QueryableStateITCase extends TestLogger { queryableState.getQueryableStateName(), key, serializedKey, - QUERY_RETRY_DELAY); + QUERY_RETRY_DELAY, + false); byte[] serializedValue = Await.result(future, deadline.timeLeft()); @@ -993,7 +1134,8 @@ public class QueryableStateITCase extends TestLogger { final String queryName, final int key, final byte[] serializedKey, - final FiniteDuration retryDelay) { + final FiniteDuration retryDelay, + final boolean failForUknownKeyOrNamespace) { return client.getKvState(jobId, queryName, key, serializedKey) .recoverWith(new Recover<Future<byte[]>>() { @@ -1001,6 +1143,9 @@ public class QueryableStateITCase extends TestLogger { public Future<byte[]> recover(Throwable failure) throws Throwable { if (failure instanceof AssertionError) { return Futures.failed(failure); + } else if (failForUknownKeyOrNamespace && + (failure instanceof UnknownKeyOrNamespace)) { + return Futures.failed(failure); } else { // At startup some failures are expected // due to races. Make sure that they don't @@ -1018,7 +1163,8 @@ public class QueryableStateITCase extends TestLogger { queryName, key, serializedKey, - retryDelay); + retryDelay, + failForUknownKeyOrNamespace); } }); }
