Skip to content
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

Jump to bottom

[Fix-14729] fix problem with the command generated by the flink task #14902

Merged
merged 3 commits into from
Sep 21, 2023
Merged

[Fix-14729] fix problem with the command generated by the flink task #14902

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6512ecb
fix the #14729 problem
Sep 12, 2023
f503e10
Merge branch 'dev' into dev-fix-14729
LiuCanWu Sep 20, 2023
cd7290c
Merge branch 'dev' into dev-fix-14729
SbloodyS Sep 21, 2023
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
8 changes: 6 additions & 2 deletions ...ask-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ private static List<String> buildRunCommandLineForOthers(TaskExecutionContext ta
args.add(others);
}

// determine yarn queue
determinedYarnQueue(args, flinkParameters, deployMode, flinkVersion);
ProgramType programType = flinkParameters.getProgramType();
String mainClass = flinkParameters.getMainClass();
if (programType != null && programType != ProgramType.PYTHON && StringUtils.isNotEmpty(mainClass)) {
Expand All @@ -295,8 +297,6 @@ private static List<String> buildRunCommandLineForOthers(TaskExecutionContext ta
args.add(ParameterUtils.convertParameterPlaceholders(mainArgs, ParameterUtils.convert(paramsMap)));
}

// determine yarn queue
determinedYarnQueue(args, flinkParameters, deployMode, flinkVersion);
return args;
}

Expand All @@ -310,8 +310,10 @@ private static void determinedYarnQueue(List<String> args, FlinkParameters flink
} else {
doAddQueue(args, flinkParameters, FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE);
}
break;
case APPLICATION:
doAddQueue(args, flinkParameters, FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS);
break;
}
}

Expand All @@ -323,9 +325,11 @@ private static void doAddQueue(List<String> args, FlinkParameters flinkParameter
switch (option) {
case FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS:
args.add(String.format(FlinkConstants.FLINK_YARN_QUEUE_FOR_TARGETS + "=%s", yarnQueue));
break;
case FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE:
args.add(FlinkConstants.FLINK_YARN_QUEUE_FOR_MODE);
args.add(yarnQueue);
break;
}
}
}
Expand Down
Loading