Skip to content

Commit b18bdb4

Browse files
committed
[hotfix] Do not leak autoscaler configs to jobs
1 parent 86ab948 commit b18bdb4

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

flink-kubernetes-operator/src/main/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkService.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.flink.api.common.JobID;
2222
import org.apache.flink.api.common.JobStatus;
2323
import org.apache.flink.api.java.tuple.Tuple2;
24+
import org.apache.flink.autoscaler.config.AutoScalerOptions;
2425
import org.apache.flink.autoscaler.utils.JobStatusUtils;
2526
import org.apache.flink.client.program.rest.RestClusterClient;
2627
import org.apache.flink.configuration.CheckpointingOptions;
@@ -984,7 +985,8 @@ protected static Configuration removeOperatorConfigs(Configuration config) {
984985
config.toMap()
985986
.forEach(
986987
(k, v) -> {
987-
if (!k.startsWith(K8S_OP_CONF_PREFIX)) {
988+
if (!k.startsWith(K8S_OP_CONF_PREFIX)
989+
&& !k.startsWith(AutoScalerOptions.AUTOSCALER_CONF_PREFIX)) {
988990
newConfig.setString(k, v);
989991
}
990992
});

flink-kubernetes-operator/src/test/java/org/apache/flink/kubernetes/operator/service/AbstractFlinkServiceTest.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -987,10 +987,15 @@ public void fetchCheckpointInfoTest() throws Exception {
987987

988988
@Test
989989
public void removeOperatorConfigTest() {
990-
var key = "kubernetes.operator.meyKey";
991-
var deployConfig = Configuration.fromMap(Map.of("kubernetes.operator.meyKey", "v"));
990+
var opKey1 = "kubernetes.operator.meyKey";
991+
var opKey2 = "job.autoscaler.";
992+
var regularKey = "k";
993+
var deployConfig =
994+
Configuration.fromMap(Map.of(opKey1, "v", opKey2, "v", regularKey, "v1"));
992995
var newConf = AbstractFlinkService.removeOperatorConfigs(deployConfig);
993-
assertFalse(newConf.containsKey(key));
996+
assertFalse(newConf.containsKey(opKey1));
997+
assertFalse(newConf.containsKey(opKey2));
998+
assertTrue(newConf.containsKey(regularKey));
994999
}
9951000

9961001
@Test

0 commit comments

Comments
 (0)