tillrohrmann commented on a change in pull request #15019: URL: https://github.com/apache/flink/pull/15019#discussion_r591323788
########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultVertexAttemptNumberStore.java ########## @@ -0,0 +1,56 @@ +/* + * 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.executiongraph; + +import org.apache.flink.runtime.jobgraph.JobVertexID; +import org.apache.flink.util.Preconditions; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** Maintains the attempt number per subtask. */ +public class DefaultVertexAttemptNumberStore implements MutableVertexAttemptNumberStore { + private final Map<JobVertexID, List<Integer>> vertexSubtaskToAttemptCounts = new HashMap<>(); + + private static final List<Integer> EMPTY = new ArrayList<>(0); + + @Override + public SubtaskAttemptNumberStore getAttemptCounts(JobVertexID vertexId) { + return new DefaultSubtaskAttemptNumberStore( + Collections.unmodifiableList( + new ArrayList<>( Review comment: Why do we create a new `ArrayList` here if it is later wrapped via `Collections.unmodifiableList`? ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/SubtaskAttemptNumberStore.java ########## @@ -0,0 +1,23 @@ +/* + * 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.executiongraph; + +/** Contains the attempt number per subtask. */ +public interface SubtaskAttemptNumberStore { + int getAttemptCount(int subtaskIndex); Review comment: `JavaDocs` ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/VertexAttemptNumberStore.java ########## @@ -0,0 +1,25 @@ +/* + * 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.executiongraph; + +import org.apache.flink.runtime.jobgraph.JobVertexID; + +/** Contains the attempt numbers per vertex. */ +public interface VertexAttemptNumberStore { + SubtaskAttemptNumberStore getAttemptCounts(JobVertexID vertexId); Review comment: `JavaDocs` ########## File path: flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointITCase.java ########## @@ -97,7 +97,7 @@ * </ul> */ @RunWith(Parameterized.class) -@Category(FailsWithAdaptiveScheduler.class) // FLINK-21400 +@Category(FailsWithAdaptiveScheduler.class) // TODO: open new ticket Review comment: TODO can be replaced with reference to `FLINK-21689`. ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/DefaultVertexAttemptNumberStore.java ########## @@ -0,0 +1,56 @@ +/* + * 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.executiongraph; + +import org.apache.flink.runtime.jobgraph.JobVertexID; +import org.apache.flink.util.Preconditions; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** Maintains the attempt number per subtask. */ +public class DefaultVertexAttemptNumberStore implements MutableVertexAttemptNumberStore { + private final Map<JobVertexID, List<Integer>> vertexSubtaskToAttemptCounts = new HashMap<>(); + + private static final List<Integer> EMPTY = new ArrayList<>(0); + + @Override + public SubtaskAttemptNumberStore getAttemptCounts(JobVertexID vertexId) { + return new DefaultSubtaskAttemptNumberStore( + Collections.unmodifiableList( + new ArrayList<>( + vertexSubtaskToAttemptCounts.getOrDefault(vertexId, EMPTY)))); Review comment: Instead of `EMPTY` we could also use `Collections.emptyList()`. Then we save on instance. ########## File path: flink-tests/src/test/java/org/apache/flink/test/checkpointing/UnalignedCheckpointTestBase.java ########## @@ -89,7 +89,7 @@ import static org.junit.Assert.fail; /** Base class for tests related to unaligned checkpoints. */ -@Category(FailsWithAdaptiveScheduler.class) // FLINK-21400 +@Category(FailsWithAdaptiveScheduler.class) // TODO: open new ticket Review comment: Same here. ########## File path: flink-runtime/src/main/java/org/apache/flink/runtime/executiongraph/MutableVertexAttemptNumberStore.java ########## @@ -0,0 +1,25 @@ +/* + * 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.executiongraph; + +import org.apache.flink.runtime.jobgraph.JobVertexID; + +/** Mutability extension to the {@link VertexAttemptNumberStore}. */ +public interface MutableVertexAttemptNumberStore extends VertexAttemptNumberStore { + void setAttemptCount(JobVertexID jobVertexId, int subtaskIndex, int attemptCount); Review comment: `JavaDocs` are missing for this method. ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
