[bug][dinky-gateway] Fix the issue where two Flink configuration items with the same prefix cause errors in Flink configuration parsing. (#4295)

Jam804 · tclxyuhang2-zhang · actions-user · web-flow · commit 7a49ae1ad020 · 2025-03-11T23:28:49.000+08:00
Co-authored-by: yuhang2.zhang &lt;yuhang2.zhang@ly.com&gt;
Co-authored-by: GH Action - Upstream Sync &lt;action@github.com&gt;
diff --git a/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java b/dinky-client/dinky-client-1.19/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
@@ -154,7 +154,7 @@ private List<String> getClusterSideConfData(Configuration flinkConfig) {
         clusterSideConfig.removeConfig(JobManagerOptions.BIND_HOST);
         clusterSideConfig.removeConfig(TaskManagerOptions.BIND_HOST);
         clusterSideConfig.removeConfig(TaskManagerOptions.HOST);
-        return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, false);
+        return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, true);
     }
 
     @VisibleForTesting
diff --git a/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java b/dinky-client/dinky-client-1.20/src/main/java/org/apache/flink/kubernetes/kubeclient/decorators/FlinkConfMountDecorator.java
@@ -154,7 +154,7 @@ private List<String> getClusterSideConfData(Configuration flinkConfig) {
         clusterSideConfig.removeConfig(JobManagerOptions.BIND_HOST);
         clusterSideConfig.removeConfig(TaskManagerOptions.BIND_HOST);
         clusterSideConfig.removeConfig(TaskManagerOptions.HOST);
-        return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, false);
+        return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, true);
     }
 
     @VisibleForTesting

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private List<String> getClusterSideConfData(Configuration flinkConfig) {`
`154`	`154`	`clusterSideConfig.removeConfig(JobManagerOptions.BIND_HOST);`
`155`	`155`	`clusterSideConfig.removeConfig(TaskManagerOptions.BIND_HOST);`
`156`	`156`	`clusterSideConfig.removeConfig(TaskManagerOptions.HOST);`
`157`		`- return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, false);`
	`157`	`+ return ConfigurationUtils.convertConfigToWritableLines(clusterSideConfig, true);`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`@VisibleForTesting`