Skip to content

Commit de0b233

Browse files
authored
[Fix-17848] Fix incorrect placement of JVM arguments in java task (#17850)
1 parent 428c986 commit de0b233

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

  • dolphinscheduler-task-plugin/dolphinscheduler-task-java/src

‎dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/main/java/org/apache/dolphinscheduler/plugin/task/java/JavaTask.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,11 @@ protected String buildJarCommand() {
136136
StringBuilder builder = new StringBuilder();
137137
builder.append(getJavaCommandPath())
138138
.append("java").append(Constants.SPACE)
139+
.append(javaParameters.getJvmArgs().trim()).append(Constants.SPACE)
139140
.append(buildResourcePath()).append(Constants.SPACE)
140141
.append("-jar").append(Constants.SPACE)
141142
.append(mainJarAbsolutePathInLocal).append(Constants.SPACE)
142-
.append(javaParameters.getMainArgs().trim()).append(Constants.SPACE)
143-
.append(javaParameters.getJvmArgs().trim());
143+
.append(javaParameters.getMainArgs().trim());
144144
return builder.toString();
145145
}
146146

@@ -165,10 +165,10 @@ protected String buildNormalJarCommand() {
165165
StringBuilder builder = new StringBuilder();
166166
builder.append(getJavaCommandPath())
167167
.append("java").append(Constants.SPACE)
168+
.append(javaParameters.getJvmArgs().trim()).append(Constants.SPACE)
168169
.append(buildResourcePath()).append(Constants.SPACE)
169170
.append(mainJarName).append(Constants.SPACE)
170-
.append(javaParameters.getMainArgs().trim()).append(Constants.SPACE)
171-
.append(javaParameters.getJvmArgs().trim());
171+
.append(javaParameters.getMainArgs().trim());
172172
return builder.toString();
173173
}
174174

‎dolphinscheduler-task-plugin/dolphinscheduler-task-java/src/test/java/org/apache/dolphinscheduler/plugin/task/java/JavaTaskTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ void buildJarCommand() {
5555
JavaTask javaTask = runJarType();
5656
assertThat(javaTask.buildJarCommand())
5757
.isEqualTo(
58-
"${JAVA_HOME}/bin/java -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar -jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host 127.0.0.1 -port 8080 -xms:50m");
58+
"${JAVA_HOME}/bin/java -xms:50m -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar -jar /tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar -host 127.0.0.1 -port 8080");
5959
}
6060

6161
/**
@@ -68,7 +68,7 @@ void buildNormalJarCommand() {
6868
JavaTask javaTask = runNormalJarType();
6969
assertThat(javaTask.buildNormalJarCommand())
7070
.isEqualTo(
71-
"${JAVA_HOME}/bin/java -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar:/tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar Test -host 127.0.0.1 -port 8080 -xms:50m");
71+
"${JAVA_HOME}/bin/java -xms:50m -classpath .:/tmp/dolphinscheduler/test/executepath:/tmp/dolphinscheduler/test/executepath/opt/share/jar/resource2.jar:/tmp/dolphinscheduler/test/executepath/opt/share/jar/main.jar Test -host 127.0.0.1 -port 8080");
7272
}
7373

7474
/**

0 commit comments

Comments
 (0)