tillrohrmann commented on a change in pull request #7320: [FLINK-11171] Avoid concurrent usage of StateSnapshotTransformer URL: https://github.com/apache/flink/pull/7320#discussion_r250210160
########## File path: flink-runtime/src/test/java/org/apache/flink/runtime/state/StateSnapshotTransformerTest.java ########## @@ -0,0 +1,197 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.flink.runtime.state; + +import org.apache.flink.api.common.state.ListStateDescriptor; +import org.apache.flink.api.common.state.MapStateDescriptor; +import org.apache.flink.api.common.state.ValueStateDescriptor; +import org.apache.flink.api.common.typeutils.base.StringSerializer; +import org.apache.flink.runtime.checkpoint.CheckpointOptions; +import org.apache.flink.runtime.state.StateSnapshotTransformer.StateSnapshotTransformFactory; +import org.apache.flink.runtime.state.internal.InternalListState; +import org.apache.flink.runtime.state.internal.InternalMapState; +import org.apache.flink.runtime.state.internal.InternalValueState; +import org.apache.flink.runtime.util.BlockerCheckpointStreamFactory; +import org.apache.flink.util.StringUtils; + +import javax.annotation.Nullable; + +import java.util.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.Random; +import java.util.concurrent.RunnableFuture; + +import static org.junit.Assert.assertEquals; + +class StateSnapshotTransformerTest { + private final AbstractKeyedStateBackend<Integer> backend; + private final BlockerCheckpointStreamFactory streamFactory; + private final StateSnapshotTransformFactory<?> snapshotTransformFactory; + + StateSnapshotTransformerTest( + AbstractKeyedStateBackend<Integer> backend, + BlockerCheckpointStreamFactory streamFactory) { + + this.backend = backend; + this.streamFactory = streamFactory; + this.snapshotTransformFactory = SingleThreadAccessCheckingsnapshotTransformFactory.create(); + } + + void testNonConcurrentSnapshotTransformerAccess() throws Exception { + List<TestState> testStates = Arrays.asList( + new TestValueState(), + new TestListState(), + new TestMapState() + ); + + for (TestState state : testStates) { + for (int i = 0; i < 100; i++) { + backend.setCurrentKey(i); + state.setToRandomValue(); + } + + CheckpointOptions checkpointOptions = CheckpointOptions.forCheckpointWithDefaultLocation(); + + RunnableFuture<SnapshotResult<KeyedStateHandle>> snapshot1 = + backend.snapshot(1L, 0L, streamFactory, checkpointOptions); + + RunnableFuture<SnapshotResult<KeyedStateHandle>> snapshot2 = + backend.snapshot(2L, 0L, streamFactory, checkpointOptions); + + Thread runner1 = new Thread(snapshot1, "snapshot1"); + runner1.start(); + Thread runner2 = new Thread(snapshot2, "snapshot2"); + runner2.start(); + + runner1.join(); + runner2.join(); + + snapshot1.get(); + snapshot2.get(); + } + } + + private abstract class TestState { + final Random rnd; + + private TestState() { + this.rnd = new Random(); + } + + abstract void setToRandomValue() throws Exception; + + String getRandomString() { + return StringUtils.getRandomString(rnd, 5, 10); + } + } + + private class TestValueState extends TestState { + private final InternalValueState<Integer, VoidNamespace, String> state; + + private TestValueState() throws Exception { + this.state = backend.createInternalState( + VoidNamespaceSerializer.INSTANCE, + new ValueStateDescriptor<>("TestValueState", StringSerializer.INSTANCE), + snapshotTransformFactory); + state.setCurrentNamespace(VoidNamespace.INSTANCE); + } + + @Override + void setToRandomValue() throws Exception { + state.update(getRandomString()); + } + } + + private class TestListState extends TestState { + private final InternalListState<Integer, VoidNamespace, String> state; + + private TestListState() throws Exception { + this.state = backend.createInternalState( + VoidNamespaceSerializer.INSTANCE, + new ListStateDescriptor<>("TestListState", StringSerializer.INSTANCE), + snapshotTransformFactory); + state.setCurrentNamespace(VoidNamespace.INSTANCE); + } + + @Override + void setToRandomValue() throws Exception { + int length = rnd.nextInt(10); + for (int i = 0; i < length; i++) { + state.add(getRandomString()); + } + } + } + + private class TestMapState extends TestState { + private final InternalMapState<Integer, VoidNamespace, String, String> state; + + private TestMapState() throws Exception { + this.state = backend.createInternalState( + VoidNamespaceSerializer.INSTANCE, + new MapStateDescriptor<>("TestMapState", StringSerializer.INSTANCE, StringSerializer.INSTANCE), + snapshotTransformFactory); + state.setCurrentNamespace(VoidNamespace.INSTANCE); + } + + @Override + void setToRandomValue() throws Exception { + int length = rnd.nextInt(10); + for (int i = 0; i < length; i++) { + state.put(getRandomString(), getRandomString()); + } + } + } + + private static class SingleThreadAccessCheckingsnapshotTransformFactory<T> + implements StateSnapshotTransformFactory<T> { + + static <T> StateSnapshotTransformFactory<T> create() { + return new SingleThreadAccessCheckingsnapshotTransformFactory<>(); + } + + @Override + public Optional<StateSnapshotTransformer<T>> createForDeserializedState() { + return createStateSnapshotTransformer(); + } + + @Override + public Optional<StateSnapshotTransformer<byte[]>> createForSerializedState() { + return createStateSnapshotTransformer(); + } + + private <T1> Optional<StateSnapshotTransformer<T1>> createStateSnapshotTransformer() { + return Optional.of(new StateSnapshotTransformer<T1>() { + private Thread currentThread = null; + + @Nullable + @Override + public T1 filterOrTransform(@Nullable T1 value) { + if (currentThread == null) { + currentThread = Thread.currentThread(); + } else { + assertEquals("Concurrent access from another thread", + currentThread, Thread.currentThread()); + } + return value; + } + }); + } + } +} Review comment: Nice test :-) ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
