wangyang0918 commented on code in PR #236:
URL:
https://github.com/apache/flink-kubernetes-operator/pull/236#discussion_r878864746
##########
flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/FlinkService.java:
##########
@@ -633,8 +623,26 @@ public Optional<Savepoint> getLastCheckpoint(JobID jobId,
Configuration conf) th
.FIELD_NAME_EXTERNAL_PATH)
.asText()));
+ if (latestCheckpointOpt.isEmpty()) {
+ // Use restore checkpoint instead
+ LOG.info(
+ "Could not find any checkpoints in the history,
returning restore checkpoint if present");
+ latestCheckpointOpt =
checkpoints.getRestorePath().map(Savepoint::of);
+ }
+
if (!latestCheckpointOpt.isPresent()) {
- LOG.warn("Could not find any externally addressable
checkpoints.");
+ LOG.warn("Could not find any checkpoints.");
+ }
+
+ if (latestCheckpointOpt.isPresent()
+ && latestCheckpointOpt
+ .get()
+ .equals(
Review Comment:
Comparing `Savepoint` with a `String`.
##########
flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/CheckpointHistoryWrapper.java:
##########
@@ -19,24 +19,43 @@
package org.apache.flink.kubernetes.operator.service;
import org.apache.flink.runtime.rest.messages.ResponseBody;
+import
org.apache.flink.runtime.rest.messages.checkpoints.CheckpointingStatistics;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.annotation.JsonProperty;
+import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.JsonNode;
import
org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.node.ObjectNode;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
+import java.util.Optional;
+
+import static
org.apache.flink.runtime.rest.messages.checkpoints.CheckpointingStatistics.FIELD_NAME_HISTORY;
+import static
org.apache.flink.runtime.rest.messages.checkpoints.CheckpointingStatistics.FIELD_NAME_LATEST_CHECKPOINTS;
+import static
org.apache.flink.runtime.rest.messages.checkpoints.CheckpointingStatistics.RestoredCheckpointStatistics.FIELD_NAME_EXTERNAL_PATH;
/** Custom Response for handling checkpoint history in a multi-version
compatible way. */
@JsonIgnoreProperties(ignoreUnknown = true)
@Data
@NoArgsConstructor
public class CheckpointHistoryWrapper implements ResponseBody {
- public static final String FIELD_NAME_HISTORY = "history";
-
@JsonProperty(FIELD_NAME_HISTORY)
private List<ObjectNode> history;
+
+ @JsonProperty(FIELD_NAME_LATEST_CHECKPOINTS)
Review Comment:
I am not sure whether we could always use the field `latest` instead of
`history`.
--
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]
