Skip to content

Commit 2b31737

Browse files
authored
Merge pull request #407 from liuyou2/dev-1.0.0
Fix jobtype run error #406
2 parents 095360b + 67ac9f2 commit 2b31737

File tree

2 files changed

+2
-9
lines changed
  • dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution

2 files changed

+2
-9
lines changed

dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,6 @@
5252
<artifactId>linkis-label-common</artifactId>
5353
<version>${linkis.version}</version>
5454
</dependency>
55-
56-
<dependency>
57-
<groupId>com.webank.wedatasphere.linkis</groupId>
58-
<artifactId>linkis-module</artifactId>
59-
<version>${linkis.version}</version>
60-
<scope>provided</scope>
61-
</dependency>
6255
</dependencies>
6356

6457
<build>

dss-orchestrator/orchestrators/dss-workflow/dss-linkis-node-execution/src/main/java/com/webank/wedatasphere/dss/linkis/node/execution/service/impl/BuildJobActionImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import com.webank.wedatasphere.linkis.manager.label.entity.engine.EngineTypeLabel;
2727
import com.webank.wedatasphere.linkis.manager.label.utils.EngineTypeLabelCreator;
2828
import com.webank.wedatasphere.linkis.protocol.utils.TaskUtils;
29-
import com.webank.wedatasphere.linkis.server.BDPJettyServerHelper;
3029
import com.webank.wedatasphere.linkis.ujes.client.request.JobExecuteAction;
3130
import com.webank.wedatasphere.linkis.ujes.client.request.JobSubmitAction;
3231

@@ -75,7 +74,8 @@ private Map<String, Object> prepareYarnLabel(Job job) {
7574
private String parseExecutionCode(Job job) {
7675
String code = job.getCode();
7776
if (StringUtils.isEmpty(code) || code.equalsIgnoreCase("null")) {
78-
code = BDPJettyServerHelper.gson().toJson(job.getParams());
77+
Gson gson = new Gson();
78+
code = gson.toJson(job.getParams());
7979
logger.info("The executable code for the job is {}", code);
8080
}
8181
return code;

0 commit comments

Comments
 (0)