pnowojski commented on a change in pull request #14953:
URL: https://github.com/apache/flink/pull/14953#discussion_r579108196
##########
File path:
flink-runtime/src/main/java/org/apache/flink/runtime/checkpoint/CheckpointSubsumeHelper.java
##########
@@ -34,14 +38,46 @@ public static void subsume(
if (checkpoints.isEmpty() || checkpoints.size() <= numRetain) {
return;
}
+ CompletedCheckpoint last = checkpoints.peekLast();
+ CompletedCheckpoint lastNotSavepoint =
getLastNotSavepoint(checkpoints);
+ Iterator<CompletedCheckpoint> iterator = checkpoints.iterator();
+ while (checkpoints.size() > numRetain && iterator.hasNext()) {
+ CompletedCheckpoint next = iterator.next();
+ if (canSubsume(next, last, lastNotSavepoint)) {
+ iterator.remove();
+ try {
+ subsumeAction.accept(next);
+ } catch (Exception e) {
+ LOG.warn("Fail to subsume the old checkpoint.", e);
+ }
+ }
+ // Don't break out from the loop to subsume intermediate savepoints
+ }
+ }
- while (checkpoints.size() > numRetain) {
- CompletedCheckpoint completedCheckpoint =
checkpoints.removeFirst();
- try {
- subsumeAction.accept(completedCheckpoint);
- } catch (Exception e) {
- LOG.warn("Fail to subsume the old checkpoint.", e);
+ @Nullable
+ private static CompletedCheckpoint
getLastNotSavepoint(Deque<CompletedCheckpoint> completed) {
+ Iterator<CompletedCheckpoint> descendingIterator =
completed.descendingIterator();
+ while (descendingIterator.hasNext()) {
+ CompletedCheckpoint next = descendingIterator.next();
+ if (!next.getProperties().isSavepoint()) {
+ return next;
}
}
+ return null;
Review comment:
I would definitely return `Optional`. You have already forgotten to pass
`@Nullable` annotation to the `canSubsume` and to the `lastNotSavepoint` local
variable.
----------------------------------------------------------------
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:
us...@infra.apache.org
