You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2023/09/11 01:46:02 UTC
[dolphinscheduler] branch 3.1.9-prepare updated: fix process service impl class compile error
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.9-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.9-prepare by this push:
new 92c744a2d3 fix process service impl class compile error
92c744a2d3 is described below
commit 92c744a2d340d2006b17456399cd5dc9eee0fe97
Author: zhuangchong <zh...@gmail.com>
AuthorDate: Mon Sep 11 09:45:47 2023 +0800
fix process service impl class compile error
---
.../service/process/ProcessServiceImpl.java | 41 +++++++++++-----------
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
index 7d4fb06ce9..5734333626 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -939,32 +939,33 @@ public class ProcessServiceImpl implements ProcessService {
return null;
}
}
- if (cmdParam != null) {
- CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
- // reset global params while repeat running and recover tolerance fault process is needed by cmdParam
- if (commandTypeIfComplement == CommandType.REPEAT_RUNNING ||
- commandTypeIfComplement == CommandType.RECOVER_TOLERANCE_FAULT_PROCESS) {
- setGlobalParamIfCommanded(processDefinition, cmdParam);
- }
- // time zone
- String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
-
- // Recalculate global parameters after rerun.
- String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
- processDefinition.getGlobalParamMap(),
- processDefinition.getGlobalParamList(),
- commandTypeIfComplement,
- processInstance.getScheduleTime(), timezoneId);
- processInstance.setGlobalParams(globalParams);
- processInstance.setProcessDefinition(processDefinition);
+ CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
+ // reset global params while repeat running and recover tolerance fault process is needed by cmdParam
+ if (commandTypeIfComplement == CommandType.REPEAT_RUNNING ||
+ commandTypeIfComplement == CommandType.RECOVER_TOLERANCE_FAULT_PROCESS) {
+ setGlobalParamIfCommanded(processDefinition, cmdParam);
}
+
+ // time zone
+ String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE);
+
+ // Recalculate global parameters after rerun.
+ String globalParams = curingGlobalParamsService.curingGlobalParams(processInstance.getId(),
+ processDefinition.getGlobalParamMap(),
+ processDefinition.getGlobalParamList(),
+ commandTypeIfComplement,
+ processInstance.getScheduleTime(), timezoneId);
+ processInstance.setGlobalParams(globalParams);
+ processInstance.setProcessDefinition(processDefinition);
+
// reset command parameter
if (processInstance.getCommandParam() != null) {
Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam());
+ Map<String, String> finalCmdParam = cmdParam;
processCmdParam.forEach((key, value) -> {
- if (!cmdParam.containsKey(key)) {
- cmdParam.put(key, value);
+ if (!finalCmdParam.containsKey(key)) {
+ finalCmdParam.put(key, value);
}
});
}