Skip to content

Commit acdab96

Browse files
authored
[Fix-17908][Flink] Remove hardcoded -sae parameter to keep plugin neutral (#17909)
1 parent d6c2c46 commit acdab96

3 files changed

Lines changed: 6 additions & 11 deletions

File tree

dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/main/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtils.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -264,11 +264,6 @@ private static List<String> buildRunCommandLineForOthers(TaskExecutionContext ta
264264
args.add(String.format("%d", parallelism)); // -p
265265
}
266266

267-
// If the job is submitted in attached mode, perform a best-effort cluster shutdown when the CLI is terminated
268-
// abruptly
269-
// The task status will be synchronized with the cluster job status
270-
args.add(FlinkConstants.FLINK_SHUTDOWN_ON_ATTACHED_EXIT); // -sae
271-
272267
// -s -yqu -yat -yD -D
273268
if (StringUtils.isNotEmpty(others)) {
274269
args.add(others);

dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/test/java/org/apache/dolphinscheduler/plugin/task/flink/FlinkArgsUtilsTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void testRunJarInApplicationMode() throws Exception {
6969
List<String> commandLine = FlinkArgsUtils.buildRunCommandLine(buildTestTaskExecutionContext(), flinkParameters);
7070

7171
Assertions.assertEquals(
72-
"${FLINK_HOME}/bin/flink run-application -t yarn-application -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -sae -c org.example.Main /opt/job.jar",
72+
"${FLINK_HOME}/bin/flink run-application -t yarn-application -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -c org.example.Main /opt/job.jar",
7373
joinStringListWithSpace(commandLine));
7474
}
7575

@@ -81,23 +81,23 @@ public void testRunJarInClusterMode() {
8181
FlinkArgsUtils.buildRunCommandLine(buildTestTaskExecutionContext(), flinkParameters);
8282

8383
Assertions.assertEquals(
84-
"${FLINK_HOME}/bin/flink run -m yarn-cluster -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -sae -c org.example.Main /opt/job.jar",
84+
"${FLINK_HOME}/bin/flink run -m yarn-cluster -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -c org.example.Main /opt/job.jar",
8585
joinStringListWithSpace(commandLine1));
8686

8787
flinkParameters.setFlinkVersion("<1.10");
8888
List<String> commandLine2 =
8989
FlinkArgsUtils.buildRunCommandLine(buildTestTaskExecutionContext(), flinkParameters);
9090

9191
Assertions.assertEquals(
92-
"${FLINK_HOME}/bin/flink run -m yarn-cluster -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -sae -c org.example.Main /opt/job.jar",
92+
"${FLINK_HOME}/bin/flink run -m yarn-cluster -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -c org.example.Main /opt/job.jar",
9393
joinStringListWithSpace(commandLine2));
9494

9595
flinkParameters.setFlinkVersion(">=1.12");
9696
List<String> commandLine3 =
9797
FlinkArgsUtils.buildRunCommandLine(buildTestTaskExecutionContext(), flinkParameters);
9898

9999
Assertions.assertEquals(
100-
"${FLINK_HOME}/bin/flink run -t yarn-per-job -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -sae -c org.example.Main /opt/job.jar",
100+
"${FLINK_HOME}/bin/flink run -t yarn-per-job -ys 4 -ynm demo-app-name -yjm 1024m -ytm 1024m -p 4 -c org.example.Main /opt/job.jar",
101101
joinStringListWithSpace(commandLine3));
102102
}
103103

@@ -107,7 +107,7 @@ public void testRunJarInLocalMode() {
107107
List<String> commandLine = FlinkArgsUtils.buildRunCommandLine(buildTestTaskExecutionContext(), flinkParameters);
108108

109109
Assertions.assertEquals(
110-
"${FLINK_HOME}/bin/flink run -p 4 -sae -c org.example.Main /opt/job.jar",
110+
"${FLINK_HOME}/bin/flink run -p 4 -c org.example.Main /opt/job.jar",
111111
joinStringListWithSpace(commandLine));
112112
}
113113

dolphinscheduler-ui/src/views/projects/components/dependencies/dependencies-modal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export default defineComponent({
5959
}
6060

6161
const cancelToHandle = () => {
62-
ctx.emit('update:show', showRef)
62+
ctx.emit('update:show', showRef.value)
6363
}
6464

6565
const renderDownstreamDependencies = () => {

0 commit comments

Comments
 (0)