Skip to content

[FLINK-37571] Fix JobGraph removal for 2.0 last-state upgrades #964

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 27, 2025
Merged

[FLINK-37571] Fix JobGraph removal for 2.0 last-state upgrades #964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...ernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/utils/FlinkUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ private static boolean checkpointExists(ConfigMap cm) {
}

private static boolean isJobGraphKey(Map.Entry<String, String> entry) {
return entry.getKey().startsWith(Constants.JOB_GRAPH_STORE_KEY_PREFIX);
return entry.getKey().startsWith(Constants.JOB_GRAPH_STORE_KEY_PREFIX)
|| entry.getKey().startsWith("executionPlan-");
}

public static boolean isZookeeperHAActivated(Configuration configuration) {
Expand Down
10 changes: 6 additions & 4 deletions ...tes-operator/src/test/java/org/apache/flink/kubernetes/operator/utils/FlinkUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

package org.apache.flink.kubernetes.operator.utils;

import org.apache.flink.api.common.JobID;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.CoreOptions;
import org.apache.flink.configuration.HighAvailabilityOptions;
Expand Down Expand Up @@ -51,6 +50,8 @@
import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer;
import io.javaoperatorsdk.operator.processing.event.ResourceID;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import java.net.HttpURLConnection;
import java.util.Collections;
Expand Down Expand Up @@ -125,12 +126,13 @@ public void testAddStartupProbe() {
assertEquals(expectedProbe, pod.getSpec().getContainers().get(1).getStartupProbe());
}

@Test
public void testDeleteJobGraphInKubernetesHA() {
@ParameterizedTest
@ValueSource(strings = {"jobGraph-jobId", "executionPlan-jobId"})
public void testDeleteJobGraphInKubernetesHA(String key) {
final String name = "ha-configmap";
final String clusterId = "cluster-id";
final Map<String, String> data = new HashMap<>();
data.put(Constants.JOB_GRAPH_STORE_KEY_PREFIX + JobID.generate(), "job-graph-data");
data.put(key, "job-graph-data");
data.put("leader", "localhost");
createHAConfigMapWithData(name, kubernetesClient.getNamespace(), clusterId, data);
assertNotNull(kubernetesClient.configMaps().withName(name).get());
Expand Down