Browse Source

[fix] Remove tenant arg in workflow definition (#13212)

current tenant in workflow only work when the first time
user do not exist, when user change the tenant in workflow
but tenant exist, it will be ignore, so we try to remove it
from workflow, and in #40 we try to create both user and tenant
vis cli instead of auto create
3.2.0-release
Jay Chung 2 years ago committed by GitHub
parent
commit
5cd8a02f87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 10
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java

10
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java

@ -226,7 +226,6 @@ public class PythonGateway {
* @param timeout timeout for workflow working, if running time longer than timeout, * @param timeout timeout for workflow working, if running time longer than timeout,
* task will mark as fail * task will mark as fail
* @param workerGroup run task in which worker group * @param workerGroup run task in which worker group
* @param tenantCode tenantCode
* @param taskRelationJson relation json for nodes * @param taskRelationJson relation json for nodes
* @param taskDefinitionJson taskDefinitionJson * @param taskDefinitionJson taskDefinitionJson
* @param otherParamsJson otherParamsJson handle other params * @param otherParamsJson otherParamsJson handle other params
@ -242,13 +241,16 @@ public class PythonGateway {
int warningGroupId, int warningGroupId,
int timeout, int timeout,
String workerGroup, String workerGroup,
String tenantCode,
int releaseState, int releaseState,
String taskRelationJson, String taskRelationJson,
String taskDefinitionJson, String taskDefinitionJson,
String otherParamsJson, String otherParamsJson,
String executionType) { String executionType) {
User user = usersService.queryUser(userName); User user = usersService.queryUser(userName);
if (user.getTenantCode() == null) {
throw new RuntimeException("Can not create or update workflow for user who not related to any tenant.");
}
Project project = projectMapper.queryByName(projectName); Project project = projectMapper.queryByName(projectName);
long projectCode = project.getCode(); long projectCode = project.getCode();
@ -263,12 +265,12 @@ public class PythonGateway {
ReleaseState.OFFLINE); ReleaseState.OFFLINE);
processDefinitionService.updateProcessDefinition(user, projectCode, name, processDefinitionService.updateProcessDefinition(user, projectCode, name,
processDefinitionCode, description, globalParams, processDefinitionCode, description, globalParams,
null, timeout, tenantCode, taskRelationJson, taskDefinitionJson, otherParamsJson, null, timeout, user.getTenantCode(), taskRelationJson, taskDefinitionJson, otherParamsJson,
executionTypeEnum); executionTypeEnum);
} else { } else {
Map<String, Object> result = processDefinitionService.createProcessDefinition(user, projectCode, name, Map<String, Object> result = processDefinitionService.createProcessDefinition(user, projectCode, name,
description, globalParams, description, globalParams,
null, timeout, tenantCode, taskRelationJson, taskDefinitionJson, otherParamsJson, null, timeout, user.getTenantCode(), taskRelationJson, taskDefinitionJson, otherParamsJson,
executionTypeEnum); executionTypeEnum);
processDefinition = (ProcessDefinition) result.get(Constants.DATA_LIST); processDefinition = (ProcessDefinition) result.get(Constants.DATA_LIST);
processDefinitionCode = processDefinition.getCode(); processDefinitionCode = processDefinition.getCode();

Loading…
Cancel
Save