CalvinKirs commented on a change in pull request #4743:
URL:
https://github.com/apache/incubator-dolphinscheduler/pull/4743#discussion_r580719386
##########
File path:
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
##########
@@ -540,13 +546,57 @@ private TaskInstance createTaskInstance(ProcessInstance
processInstance, String
} else {
taskInstance.setWorkerGroup(taskWorkerGroup);
}
-
+ //get process global
+ setProcessGlobal(taskNode, taskInstance);
// delay execution time
taskInstance.setDelayTime(taskNode.getDelayTime());
}
return taskInstance;
}
+ private void setProcessGlobal(TaskNode taskNode, TaskInstance
taskInstance) {
+ String globalParams = this.processInstance.getGlobalParams();
+ if (StringUtils.isNotEmpty(globalParams)) {
+ Map<String, String> globalMap = getGlobalParamMap(globalParams);
+ if (globalMap != null && globalMap.size() != 0) {
+ setGlobalMapToTask(taskNode, taskInstance, globalMap);
+ }
+ }
+ }
+
+ private void setGlobalMapToTask(TaskNode taskNode, TaskInstance
taskInstance, Map<String, String> globalMap) {
+ // the param save in localParams
+ Map<String, Object> result = JSONUtils.toMap(taskNode.getParams(),
String.class, Object.class);
+ Object localParams = result.get(LOCAL_PARAMS);
+ if (localParams != null) {
+ List<Property> allParam =
JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
+ for (Property info : allParam) {
+ if (info.getDirect().equals(Direct.IN)) {
+ String paramName = info.getProp();
+ String value = globalMap.get(paramName);
+ if (StringUtils.isNotEmpty(value)) {
+ info.setValue(value);
+ }
+ }
+ }
+ result.put(LOCAL_PARAMS, allParam);
+ taskNode.setParams(JSONUtils.toJsonString(result));
+ // task instance node json
+ taskInstance.setTaskJson(JSONUtils.toJsonString(taskNode));
+ }
+ }
+
+ public Map<String, String> getGlobalParamMap(String globalParams) {
+ List<Property> propList;
+ Map<String,String> globalParamMap = new HashMap<>();
+ if (StringUtils.isNotEmpty(globalParams)) {
Review comment:
It would be better to use StringUtils.isBank
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
