zentol commented on code in PR #20852: URL: https://github.com/apache/flink/pull/20852#discussion_r988926581
########## flink-runtime/src/main/java/org/apache/flink/runtime/rest/messages/checkpoints/CheckpointTriggerInfo.java: ########## @@ -0,0 +1,78 @@ +/* + * 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.rest.messages.checkpoints; + +import org.apache.flink.runtime.rest.messages.ResponseBody; +import org.apache.flink.runtime.rest.messages.json.SerializedThrowableDeserializer; +import org.apache.flink.runtime.rest.messages.json.SerializedThrowableSerializer; +import org.apache.flink.util.SerializedThrowable; + +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonCreator; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonInclude; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.annotation.JsonSerialize; + +import javax.annotation.Nullable; + +import static org.apache.flink.util.Preconditions.checkArgument; + +/** Represents information about a finished triggered checkpoint. */ +@JsonInclude(JsonInclude.Include.NON_NULL) +public class CheckpointTriggerInfo implements ResponseBody { + + private static final String FIELD_NAME_CHECKPOINT_ID = "checkpointId"; + + private static final String FIELD_NAME_FAILURE_CAUSE = "failure-cause"; + + @JsonProperty(FIELD_NAME_CHECKPOINT_ID) + @Nullable + private final Long checkpointId; + + @JsonProperty(FIELD_NAME_FAILURE_CAUSE) + @JsonSerialize(using = SerializedThrowableSerializer.class) + @JsonDeserialize(using = SerializedThrowableDeserializer.class) + @Nullable + private final SerializedThrowable failureCause; + + @JsonCreator + public CheckpointTriggerInfo( + @JsonProperty(FIELD_NAME_CHECKPOINT_ID) @Nullable final Long checkpointId, + @JsonProperty(FIELD_NAME_FAILURE_CAUSE) + @JsonDeserialize(using = SerializedThrowableDeserializer.class) + @Nullable + final SerializedThrowable failureCause) { + checkArgument( + checkpointId != null ^ failureCause != null, + "Either checkpointId or failureCause must be set"); + + this.checkpointId = checkpointId; + this.failureCause = failureCause; + } + + @Nullable + public Long getCheckpointId() { + return checkpointId; + } + + @Nullable + public SerializedThrowable getFailureCause() { + return failureCause; + } Review Comment: You can add a hotfix commit for that, yes. ########## flink-runtime/src/main/java/org/apache/flink/runtime/dispatcher/DispatcherOperationCaches.java: ########## @@ -40,13 +42,19 @@ public DispatcherOperationCaches() { @VisibleForTesting public DispatcherOperationCaches(Duration cacheDuration) { savepointTriggerCache = new CompletedOperationCache<>(cacheDuration); + checkpointTriggerCache = new CompletedOperationCache<>(cacheDuration); } public CompletedOperationCache<AsynchronousJobOperationKey, String> getSavepointTriggerCache() { return savepointTriggerCache; } + public CompletedOperationCache<AsynchronousJobOperationKey, Long> getCheckpointTriggerCache() { + return checkpointTriggerCache; + } + public CompletableFuture<Void> shutdownCaches() { - return savepointTriggerCache.closeAsync(); + return CompletableFuture.allOf( Review Comment: FutureUtils#completeAll is preferable because it doesn't drop exceptions should multiple futures fail. -- 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. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
