Support the ${jobName} variable in Flink configuration. #4062
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wolfboys
reviewed
Sep 14, 2024
| submitRequest.flinkVersion.flinkHome, | ||
| activeCommandLine, | ||
| commandLine, | ||
| submitRequest.appName) |
There was a problem hiding this comment.
This needs to be replaced with submit request.effectiveAppName
| @@ -452,7 +459,7 @@ trait FlinkClientTrait extends Logger { | |||
| key => { | |||
| val value = flinkDefaultConfiguration.getString(key, null) | |||
| if (value != null) { | |||
| configuration.setString(key, value) | |||
| configuration.setString(key, CommonUtils.fixedValueBaseVar(value, jobName)) | |||
There was a problem hiding this comment.
val v = value
.replaceAll("\\$job(Name|name)", jobName)
.replaceAll("\\$\\{job(Name|name)}", jobName)
configuration.setString(key, v)
| private CommonUtils() {} | ||
|
|
||
| public static String fixedValueBaseVar(String configValue, String jobName) { | ||
| return configValue.replace("${jobName}", jobName); |
There was a problem hiding this comment.
It is not recommended to add a method for this purpose and put it in the public module.
|
wolfboys
reviewed
Sep 14, 2024
| @@ -115,11 +116,14 @@ public Map<String, String> convertFlinkYamlAsMap() { | |||
| } | |||
|
|
|||
| @JsonIgnore | |||
| public Properties getFlinkConfig() { | |||
| public Properties getFlinkConfig(Application application) { | |||
There was a problem hiding this comment.
@JsonIgnore
public Properties getFlinkConfig(Application application) {
String flinkYamlString = DeflaterUtils.unzipString(flinkConf);
Properties flinkConfig = new Properties();
Map<String, String> config = PropertiesUtils.loadFlinkConfYaml(flinkYamlString);
for (Map.Entry<String, String> entry : config.entrySet()) {
String value = entry.getValue();
if (StringUtils.isNotBlank(application.getJobName())) {
value =
value.replaceAll("\\$\\{job(Name|name)}|\\$job(Name|name)", application.getJobName());
}
if (application.getId() != null) {
value = value.replaceAll("\\$\\{job(Id|id)}|\\$job(Id|id)", application.getId().toString());
}
flinkConfig.setProperty(entry.getKey(), value);
}
return flinkConfig;
}
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What changes were proposed in this pull request
Issue Number: close #3463
Brief change log
Support the ${jobName} variable in Flink configuration files. This makes it easier to differentiate the files for each job, including savepoints, checkpoints, high availability files, etc.
Verifying this change
This change is a trivial rework / code cleanup without any test coverage.
(or)
This change is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
Does this pull request potentially affect one of the following parts