Skip to content

[Improvement-15701][flink_task] supported variables of flink tasks #15708

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

Closed
wants to merge 6 commits into from
Closed

[Improvement-15701][flink_task] supported variables of flink tasks #15708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e8a71f
[Improvement][flink_task]supported variables of flink tasks
bajiaolong Aug 2, 2024
f916f60
Merge branch 'dev' into mydev/issues_15701
bajiaolong Aug 2, 2024
e3d9d69
Merge branch 'dev' into mydev/issues_15701
bajiaolong Aug 6, 2024
c685bc4
Merge branch 'dev' into mydev/issues_15701
SbloodyS Aug 12, 2024
2c5994d
Merge branch 'dev' into mydev/issues_15701
bajiaolong Aug 14, 2024
4853dc5
Merge branch 'dev' into mydev/issues_15701
bajiaolong Sep 3, 2024
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
2 changes: 1 addition & 1 deletion ...-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractYarnTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public AbstractYarnTask(TaskExecutionContext taskRequest) {
@Override
public void handle(TaskCallBack taskCallBack) throws TaskException {
try {
IShellInterceptorBuilder shellActuatorBuilder = ShellInterceptorBuilderFactory.newBuilder()
IShellInterceptorBuilder<?, ?> shellActuatorBuilder = ShellInterceptorBuilderFactory.newBuilder()
.properties(getProperties())
// todo: do we need to move the replace to subclass?
.appendScript(getScript().replaceAll("\\r\\n", System.lineSeparator()));
Expand Down
3 changes: 2 additions & 1 deletion ...k-stream/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkStreamTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.stream.StreamTask;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;

import org.apache.commons.collections4.CollectionUtils;

Expand Down Expand Up @@ -72,7 +73,7 @@ protected String getScript() {

@Override
protected Map<String, String> getProperties() {
return taskExecutionContext.getDefinedParams();
return ParameterUtils.convert(taskExecutionContext.getPrepareParamsMap());
}

@Override
Expand Down
16 changes: 12 additions & 4 deletions ...ler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FileUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.RWXR_XR_X;

import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.SystemUtils;
Expand All @@ -33,6 +34,7 @@
import java.nio.file.attribute.FileAttribute;
import java.nio.file.attribute.PosixFilePermission;
import java.nio.file.attribute.PosixFilePermissions;
import java.util.Map;
import java.util.Set;

import lombok.extern.slf4j.Slf4j;
Expand All @@ -59,11 +61,15 @@ public static void generateScriptFile(TaskExecutionContext taskExecutionContext,
String initOptionsString = StringUtils.join(
FlinkArgsUtils.buildInitOptionsForSql(flinkParameters),
FlinkConstants.FLINK_SQL_NEWLINE).concat(FlinkConstants.FLINK_SQL_NEWLINE);
writeScriptFile(initScriptFilePath, initOptionsString + flinkParameters.getInitScript());
writeScriptFile(scriptFilePath, flinkParameters.getRawScript());

// get all configuration
Map<String, String> propertiesMap = ParameterUtils.convert(taskExecutionContext.getPrepareParamsMap());

writeScriptFile(initScriptFilePath, initOptionsString + flinkParameters.getInitScript(), propertiesMap);
writeScriptFile(scriptFilePath, flinkParameters.getRawScript(), propertiesMap);
}

private static void writeScriptFile(String scriptFileFullPath, String script) {
private static void writeScriptFile(String scriptFileFullPath, String script, Map<String, String> propertiesMap) {
File scriptFile = new File(scriptFileFullPath);
Path path = scriptFile.toPath();
if (Files.exists(path)) {
Expand All @@ -88,7 +94,9 @@ private static void writeScriptFile(String scriptFileFullPath, String script) {
}

if (StringUtils.isNotEmpty(script)) {
String replacedScript = script.replaceAll("\\r\\n", "\n");
// Replace parameter placeholders in the script
String replacedScript =
ParameterUtils.convertParameterPlaceholders(script, propertiesMap).replaceAll("\\r\\n", "\n");
FileUtils.writeStringToFile(scriptFile, replacedScript, StandardOpenOption.APPEND);
}
} catch (IOException e) {
Expand Down
3 changes: 2 additions & 1 deletion ...ler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext;
import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;

import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -81,7 +82,7 @@ protected String getScript() {

@Override
protected Map<String, String> getProperties() {
return taskExecutionContext.getDefinedParams();
return ParameterUtils.convert(taskExecutionContext.getPrepareParamsMap());
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion ...duler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ protected String getScript() {

@Override
protected Map<String, String> getProperties() {
return taskExecutionContext.getDefinedParams();
return ParameterUtils.convert(taskExecutionContext.getPrepareParamsMap());
}

@Override
Expand Down
Loading