status
stringclasses 1
value | repo_name
stringclasses 31
values | repo_url
stringclasses 31
values | issue_id
int64 1
104k
| title
stringlengths 4
233
| body
stringlengths 0
186k
⌀ | issue_url
stringlengths 38
56
| pull_url
stringlengths 37
54
| before_fix_sha
stringlengths 40
40
| after_fix_sha
stringlengths 40
40
| report_datetime
timestamp[us, tz=UTC] | language
stringclasses 5
values | commit_datetime
timestamp[us, tz=UTC] | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | createProjects = new ArrayList<>();
}
if (authedProjects != null) {
createProjects.addAll(authedProjects);
}
return createProjects;
}
/**
* list unauthorized udf function
*
* @param userId user id
* @param needChecks data source id array
* @return unauthorized udf function list
*/
public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) {
List<T> resultList = new ArrayList<>();
if (Objects.nonNull(needChecks) && needChecks.length > 0) {
Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
switch (authorizationType) {
case RESOURCE_FILE_ID:
case UDF_FILE:
List<Resource> ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks);
addAuthorizedResources(ownUdfResources, userId);
Set<Integer> authorizedResourceFiles = ownUdfResources.stream().map(Resource::getId).collect(toSet());
originResSet.removeAll(authorizedResourceFiles);
break;
case RESOURCE_FILE_NAME:
List<Resource> ownResources = resourceMapper.listAuthorizedResource(userId, needChecks);
addAuthorizedResources(ownResources, userId);
Set<String> authorizedResources = ownResources.stream().map(Resource::getFullName).collect(toSet()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | originResSet.removeAll(authorizedResources);
break;
case DATASOURCE:
Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet());
originResSet.removeAll(authorizedDatasources);
break;
case UDF:
Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet());
originResSet.removeAll(authorizedUdfs);
break;
default:
break;
}
resultList.addAll(originResSet);
}
return resultList;
}
/**
* get user by user id
*
* @param userId user id
* @return User
*/
public User getUserById(int userId) {
return userMapper.selectById(userId);
}
/**
* get resource by resource id
*
* @param resourceId resource id |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @return Resource
*/
public Resource getResourceById(int resourceId) {
return resourceMapper.selectById(resourceId);
}
/**
* list resources by ids
*
* @param resIds resIds
* @return resource list
*/
public List<Resource> listResourceByIds(Integer[] resIds) {
return resourceMapper.listResourceByIds(resIds);
}
/**
* format task app id in task instance
*/
public String formatTaskAppId(TaskInstance taskInstance) {
ProcessInstance processInstance = findProcessInstanceById(taskInstance.getProcessInstanceId());
if (processInstance == null) {
return "";
}
ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
if (definition == null) {
return "";
}
return String.format("%s_%s_%s", definition.getId(), processInstance.getId(), taskInstance.getId());
}
/**
* switch process definition version to process definition log version |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
public int switchVersion(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog) {
if (null == processDefinition || null == processDefinitionLog) {
return Constants.DEFINITION_FAILURE;
}
processDefinitionLog.setId(processDefinition.getId());
processDefinitionLog.setReleaseState(ReleaseState.OFFLINE);
processDefinitionLog.setFlag(Flag.YES);
int result = processDefineMapper.updateById(processDefinitionLog);
if (result > 0) {
result = switchProcessTaskRelationVersion(processDefinitionLog);
if (result <= 0) {
return Constants.EXIT_CODE_FAILURE;
}
}
return result;
}
public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode());
if (!processTaskRelationList.isEmpty()) {
processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode());
}
List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
int batchInsert = processTaskRelationMapper.batchInsert(processTaskRelationLogList);
if (batchInsert == 0) {
return Constants.EXIT_CODE_FAILURE;
} else {
int result = 0;
for (ProcessTaskRelationLog taskRelationLog : processTaskRelationLogList) {
int switchResult = switchTaskDefinitionVersion(taskRelationLog.getPostTaskCode(), taskRelationLog.getPostTaskVersion()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (switchResult != Constants.EXIT_CODE_FAILURE) {
result++;
}
}
return result;
}
}
public int switchTaskDefinitionVersion(long taskCode, int taskVersion) {
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null) {
return Constants.EXIT_CODE_FAILURE;
}
if (taskDefinition.getVersion() == taskVersion) {
return Constants.EXIT_CODE_SUCCESS;
}
TaskDefinitionLog taskDefinitionUpdate = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskVersion);
if (taskDefinitionUpdate == null) {
return Constants.EXIT_CODE_FAILURE;
}
taskDefinitionUpdate.setUpdateTime(new Date());
taskDefinitionUpdate.setId(taskDefinition.getId());
return taskDefinitionMapper.updateById(taskDefinitionUpdate);
}
/**
* get resource ids
*
* @param taskDefinition taskDefinition
* @return resource ids
*/
public String getResourceIds(TaskDefinition taskDefinition) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | Set<Integer> resourceIds = null;
AbstractParameters params = taskPluginManager.getParameters(ParametersNode.builder().taskType(taskDefinition.getTaskType()).taskParams(taskDefinition.getTaskParams()).build());
if (params != null && CollectionUtils.isNotEmpty(params.getResourceFilesList())) {
resourceIds = params.getResourceFilesList().
stream()
.filter(t -> t.getId() != 0)
.map(ResourceInfo::getId)
.collect(Collectors.toSet());
}
if (CollectionUtils.isEmpty(resourceIds)) {
return StringUtils.EMPTY;
}
return StringUtils.join(resourceIds, ",");
}
public int saveTaskDefine(User operator, long projectCode, List<TaskDefinitionLog> taskDefinitionLogs, Boolean syncDefine) {
Date now = new Date();
List<TaskDefinitionLog> newTaskDefinitionLogs = new ArrayList<>();
List<TaskDefinitionLog> updateTaskDefinitionLogs = new ArrayList<>();
for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
taskDefinitionLog.setProjectCode(projectCode);
taskDefinitionLog.setUpdateTime(now);
taskDefinitionLog.setOperateTime(now);
taskDefinitionLog.setOperator(operator.getId());
taskDefinitionLog.setResourceIds(getResourceIds(taskDefinitionLog));
if (taskDefinitionLog.getCode() == 0) {
try {
taskDefinitionLog.setCode(CodeGenerateUtils.getInstance().genCode());
} catch (CodeGenerateException e) {
logger.error("Task code get error, ", e);
return Constants.DEFINITION_FAILURE; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
}
if (taskDefinitionLog.getVersion() == 0) {
taskDefinitionLog.setVersion(Constants.VERSION_FIRST);
}
TaskDefinitionLog definitionCodeAndVersion = taskDefinitionLogMapper
.queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion());
if (definitionCodeAndVersion == null) {
taskDefinitionLog.setUserId(operator.getId());
taskDefinitionLog.setCreateTime(now);
newTaskDefinitionLogs.add(taskDefinitionLog);
continue;
}
if (taskDefinitionLog.equals(definitionCodeAndVersion)) {
continue;
}
taskDefinitionLog.setUserId(definitionCodeAndVersion.getUserId());
Integer version = taskDefinitionLogMapper.queryMaxVersionForDefinition(taskDefinitionLog.getCode());
taskDefinitionLog.setVersion(version + 1);
taskDefinitionLog.setCreateTime(definitionCodeAndVersion.getCreateTime());
updateTaskDefinitionLogs.add(taskDefinitionLog);
}
int insertResult = 0;
int updateResult = 0;
for (TaskDefinitionLog taskDefinitionToUpdate : updateTaskDefinitionLogs) {
TaskDefinition task = taskDefinitionMapper.queryByCode(taskDefinitionToUpdate.getCode());
if (task == null) {
newTaskDefinitionLogs.add(taskDefinitionToUpdate); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | } else {
insertResult += taskDefinitionLogMapper.insert(taskDefinitionToUpdate);
if (Boolean.TRUE.equals(syncDefine)) {
taskDefinitionToUpdate.setId(task.getId());
updateResult += taskDefinitionMapper.updateById(taskDefinitionToUpdate);
} else {
updateResult++;
}
}
}
if (!newTaskDefinitionLogs.isEmpty()) {
insertResult += taskDefinitionLogMapper.batchInsert(newTaskDefinitionLogs);
if (Boolean.TRUE.equals(syncDefine)) {
updateResult += taskDefinitionMapper.batchInsert(newTaskDefinitionLogs);
} else {
updateResult += newTaskDefinitionLogs.size();
}
}
return (insertResult & updateResult) > 0 ? 1 : Constants.EXIT_CODE_SUCCESS;
}
/**
* save processDefinition (including create or update processDefinition)
*/
public int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean syncDefine, Boolean isFromProcessDefine) {
ProcessDefinitionLog processDefinitionLog = new ProcessDefinitionLog(processDefinition);
Integer version = processDefineLogMapper.queryMaxVersionForDefinition(processDefinition.getCode());
int insertVersion = version == null || version == 0 ? Constants.VERSION_FIRST : version + 1;
processDefinitionLog.setVersion(insertVersion);
processDefinitionLog.setReleaseState(!isFromProcessDefine || processDefinitionLog.getReleaseState() == ReleaseState.ONLINE ? ReleaseState.ONLINE : ReleaseState.OFFLINE);
processDefinitionLog.setOperator(operator.getId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processDefinitionLog.setOperateTime(processDefinition.getUpdateTime());
int insertLog = processDefineLogMapper.insert(processDefinitionLog);
int result = 1;
if (Boolean.TRUE.equals(syncDefine)) {
if (0 == processDefinition.getId()) {
result = processDefineMapper.insert(processDefinitionLog);
} else {
processDefinitionLog.setId(processDefinition.getId());
result = processDefineMapper.updateById(processDefinitionLog);
}
}
return (insertLog & result) > 0 ? insertVersion : 0;
}
/**
* save task relations
*/
public int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, int processDefinitionVersion,
List<ProcessTaskRelationLog> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs,
Boolean syncDefine) {
if (taskRelationList.isEmpty()) {
return Constants.EXIT_CODE_SUCCESS;
}
Map<Long, TaskDefinitionLog> taskDefinitionLogMap = null;
if (CollectionUtils.isNotEmpty(taskDefinitionLogs)) {
taskDefinitionLogMap = taskDefinitionLogs.stream()
.collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog));
}
Date now = new Date();
for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) {
processTaskRelationLog.setProjectCode(projectCode); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processTaskRelationLog.setProcessDefinitionCode(processDefinitionCode);
processTaskRelationLog.setProcessDefinitionVersion(processDefinitionVersion);
if (taskDefinitionLogMap != null) {
TaskDefinitionLog preTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode());
if (preTaskDefinitionLog != null) {
processTaskRelationLog.setPreTaskVersion(preTaskDefinitionLog.getVersion());
}
TaskDefinitionLog postTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode());
if (postTaskDefinitionLog != null) {
processTaskRelationLog.setPostTaskVersion(postTaskDefinitionLog.getVersion());
}
}
processTaskRelationLog.setCreateTime(now);
processTaskRelationLog.setUpdateTime(now);
processTaskRelationLog.setOperator(operator.getId());
processTaskRelationLog.setOperateTime(now);
}
int insert = taskRelationList.size();
if (Boolean.TRUE.equals(syncDefine)) {
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode);
if (!processTaskRelationList.isEmpty()) {
Set<Integer> processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet());
Set<Integer> taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet());
boolean result = CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet);
if (result) {
return Constants.EXIT_CODE_SUCCESS;
}
processTaskRelationMapper.deleteByCode(projectCode, processDefinitionCode);
}
insert = processTaskRelationMapper.batchInsert(taskRelationList); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
int resultLog = processTaskRelationLogMapper.batchInsert(taskRelationList);
return (insert & resultLog) > 0 ? Constants.EXIT_CODE_SUCCESS : Constants.EXIT_CODE_FAILURE;
}
public boolean isTaskOnline(long taskCode) {
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByTaskCode(taskCode);
if (!processTaskRelationList.isEmpty()) {
Set<Long> processDefinitionCodes = processTaskRelationList
.stream()
.map(ProcessTaskRelation::getProcessDefinitionCode)
.collect(Collectors.toSet());
List<ProcessDefinition> processDefinitionList = processDefineMapper.queryByCodes(processDefinitionCodes);
for (ProcessDefinition processDefinition : processDefinitionList) {
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
return true;
}
}
}
return false;
}
/**
* Generate the DAG Graph based on the process definition id
* Use temporarily before refactoring taskNode
*
* @param processDefinition process definition
* @return dag graph
*/
public DAG<String, TaskNode, TaskNodeRelation> genDagGraph(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> taskRelations = this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<TaskNode> taskNodeList = transformTask(taskRelations, Lists.newArrayList());
ProcessDag processDag = DagHelper.getProcessDag(taskNodeList, new ArrayList<>(taskRelations));
return DagHelper.buildDagGraph(processDag);
}
/**
* generate DagData
*/
public DagData genDagData(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> taskRelations = this.findRelationByCode(processDefinition.getCode(), processDefinition.getVersion());
List<TaskDefinitionLog> taskDefinitionLogList = genTaskDefineList(taskRelations);
List<TaskDefinition> taskDefinitions = taskDefinitionLogList.stream().map(t -> (TaskDefinition) t).collect(Collectors.toList());
return new DagData(processDefinition, taskRelations, taskDefinitions);
}
public List<TaskDefinitionLog> genTaskDefineList(List<ProcessTaskRelation> processTaskRelations) {
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelation processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPreTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion()));
}
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
if (taskDefinitionSet.isEmpty()) {
return Lists.newArrayList();
}
return taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
}
public List<TaskDefinitionLog> getTaskDefineLogListByRelation(List<ProcessTaskRelation> processTaskRelations) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<TaskDefinitionLog> taskDefinitionLogs = new ArrayList<>();
Map<Long, Integer> taskCodeVersionMap = new HashMap<>();
for (ProcessTaskRelation processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPreTaskCode() > 0) {
taskCodeVersionMap.put(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion());
}
if (processTaskRelation.getPostTaskCode() > 0) {
taskCodeVersionMap.put(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion());
}
}
taskCodeVersionMap.forEach((code,version) -> {
taskDefinitionLogs.add((TaskDefinitionLog) this.findTaskDefinition(code, version));
});
return taskDefinitionLogs;
}
/**
* find task definition by code and version
*/
public TaskDefinition findTaskDefinition(long taskCode, int taskDefinitionVersion) {
return taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskDefinitionVersion);
}
/**
* find process task relation list by process
*/
public List<ProcessTaskRelation> findRelationByCode(long processDefinitionCode, int processDefinitionVersion) {
List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinitionCode, processDefinitionVersion);
return processTaskRelationLogList.stream().map(r -> (ProcessTaskRelation) r).collect(Collectors.toList());
}
/**
* add authorized resources |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param ownResources own resources
* @param userId userId
*/
private void addAuthorizedResources(List<Resource> ownResources, int userId) {
List<Integer> relationResourceIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, 7);
List<Resource> relationResources = CollectionUtils.isNotEmpty(relationResourceIds) ? resourceMapper.queryResourceListById(relationResourceIds) : new ArrayList<>();
ownResources.addAll(relationResources);
}
/**
* Use temporarily before refactoring taskNode
*/
public List<TaskNode> transformTask(List<ProcessTaskRelation> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs) {
Map<Long, List<Long>> taskCodeMap = new HashMap<>();
for (ProcessTaskRelation processTaskRelation : taskRelationList) {
taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> {
if (v == null) {
v = new ArrayList<>();
}
if (processTaskRelation.getPreTaskCode() != 0L) {
v.add(processTaskRelation.getPreTaskCode());
}
return v;
});
}
if (CollectionUtils.isEmpty(taskDefinitionLogs)) {
taskDefinitionLogs = genTaskDefineList(taskRelationList);
}
Map<Long, TaskDefinitionLog> taskDefinitionLogMap = taskDefinitionLogs.stream()
.collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<TaskNode> taskNodeList = new ArrayList<>();
for (Entry<Long, List<Long>> code : taskCodeMap.entrySet()) {
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(code.getKey());
if (taskDefinitionLog != null) {
TaskNode taskNode = new TaskNode();
taskNode.setCode(taskDefinitionLog.getCode());
taskNode.setVersion(taskDefinitionLog.getVersion());
taskNode.setName(taskDefinitionLog.getName());
taskNode.setDesc(taskDefinitionLog.getDescription());
taskNode.setType(taskDefinitionLog.getTaskType().toUpperCase());
taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN);
taskNode.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes());
taskNode.setRetryInterval(taskDefinitionLog.getFailRetryInterval());
Map<String, Object> taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams());
taskNode.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT)));
taskNode.setSwitchResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.SWITCH_RESULT)));
taskNode.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE)));
taskParamsMap.remove(Constants.CONDITION_RESULT);
taskParamsMap.remove(Constants.DEPENDENCE);
taskNode.setParams(JSONUtils.toJsonString(taskParamsMap));
taskNode.setTaskInstancePriority(taskDefinitionLog.getTaskPriority());
taskNode.setWorkerGroup(taskDefinitionLog.getWorkerGroup());
taskNode.setEnvironmentCode(taskDefinitionLog.getEnvironmentCode());
taskNode.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN,
taskDefinitionLog.getTimeoutNotifyStrategy(),
taskDefinitionLog.getTimeout())));
taskNode.setDelayTime(taskDefinitionLog.getDelayTime());
taskNode.setPreTasks(JSONUtils.toJsonString(code.getValue().stream().map(taskDefinitionLogMap::get).map(TaskDefinition::getCode).collect(Collectors.toList())));
taskNode.setTaskGroupId(taskDefinitionLog.getTaskGroupId());
taskNode.setTaskGroupPriority(taskDefinitionLog.getTaskGroupPriority()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | taskNodeList.add(taskNode);
}
}
return taskNodeList;
}
public Map<ProcessInstance, TaskInstance> notifyProcessList(int processId) {
HashMap<ProcessInstance, TaskInstance> processTaskMap = new HashMap<>();
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId);
if (processInstanceMap == null) {
return processTaskMap;
}
ProcessInstance fatherProcess = this.findProcessInstanceById(processInstanceMap.getParentProcessInstanceId());
TaskInstance fatherTask = this.findTaskInstanceById(processInstanceMap.getParentTaskInstanceId());
if (fatherProcess != null) {
processTaskMap.put(fatherProcess, fatherTask);
}
return processTaskMap;
}
public DqExecuteResult getDqExecuteResultByTaskInstanceId(int taskInstanceId) {
return dqExecuteResultMapper.getExecuteResultById(taskInstanceId);
}
public int updateDqExecuteResultUserId(int taskInstanceId) {
DqExecuteResult dqExecuteResult =
dqExecuteResultMapper.selectOne(new QueryWrapper<DqExecuteResult>().eq(TASK_INSTANCE_ID,taskInstanceId));
if (dqExecuteResult == null) {
return -1;
}
ProcessInstance processInstance = processInstanceMapper.selectById(dqExecuteResult.getProcessInstanceId());
if (processInstance == null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return -1;
}
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition == null) {
return -1;
}
dqExecuteResult.setProcessDefinitionId(processDefinition.getId());
dqExecuteResult.setUserId(processDefinition.getUserId());
dqExecuteResult.setState(DqTaskState.DEFAULT.getCode());
return dqExecuteResultMapper.updateById(dqExecuteResult);
}
public int updateDqExecuteResultState(DqExecuteResult dqExecuteResult) {
return dqExecuteResultMapper.updateById(dqExecuteResult);
}
public int deleteDqExecuteResultByTaskInstanceId(int taskInstanceId) {
return dqExecuteResultMapper.delete(
new QueryWrapper<DqExecuteResult>()
.eq(TASK_INSTANCE_ID,taskInstanceId));
}
public int deleteTaskStatisticsValueByTaskInstanceId(int taskInstanceId) {
return dqTaskStatisticsValueMapper.delete(
new QueryWrapper<DqTaskStatisticsValue>()
.eq(TASK_INSTANCE_ID,taskInstanceId));
}
public DqRule getDqRule(int ruleId) {
return dqRuleMapper.selectById(ruleId);
}
public List<DqRuleInputEntry> getRuleInputEntry(int ruleId) {
return DqRuleUtils.transformInputEntry(dqRuleInputEntryMapper.getRuleInputEntryList(ruleId));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public List<DqRuleExecuteSql> getDqExecuteSql(int ruleId) {
return dqRuleExecuteSqlMapper.getExecuteSqlList(ruleId);
}
public DqComparisonType getComparisonTypeById(int id) {
return dqComparisonTypeMapper.selectById(id);
}
/**
* the first time (when submit the task ) get the resource of the task group
* @param taskId task id
* @param taskName
* @param groupId
* @param processId
* @param priority
* @return
*/
public boolean acquireTaskGroup(int taskId,
String taskName, int groupId,
int processId, int priority) {
TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
if (taskGroup == null) {
return true;
}
if (taskGroup.getStatus() == Flag.NO.getCode()) {
return true;
}
TaskGroupQueue taskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskId);
if (taskGroupQueue == null) {
taskGroupQueue = insertIntoTaskGroupQueue(taskId, taskName, groupId, processId, priority, TaskGroupQueueStatus.WAIT_QUEUE);
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (taskGroupQueue.getStatus() == TaskGroupQueueStatus.ACQUIRE_SUCCESS) {
return true;
}
taskGroupQueue.setInQueue(Flag.NO.getCode());
taskGroupQueue.setStatus(TaskGroupQueueStatus.WAIT_QUEUE);
this.taskGroupQueueMapper.updateById(taskGroupQueue);
}
List<TaskGroupQueue> highPriorityTasks = taskGroupQueueMapper.queryHighPriorityTasks(groupId, priority, TaskGroupQueueStatus.WAIT_QUEUE.getCode());
if (CollectionUtils.isNotEmpty(highPriorityTasks)) {
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return false;
}
int count = taskGroupMapper.selectAvailableCountById(groupId);
if (count == 1 && robTaskGroupResouce(taskGroupQueue)) {
return true;
}
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return false;
}
/**
* try to get the task group resource(when other task release the resource)
* @param taskGroupQueue
* @return
*/
public boolean robTaskGroupResouce(TaskGroupQueue taskGroupQueue) {
TaskGroup taskGroup = taskGroupMapper.selectById(taskGroupQueue.getGroupId());
int affectedCount = taskGroupMapper.updateTaskGroupResource(taskGroup.getId(),taskGroupQueue.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (affectedCount > 0) {
taskGroupQueue.setStatus(TaskGroupQueueStatus.ACQUIRE_SUCCESS);
this.taskGroupQueueMapper.updateById(taskGroupQueue);
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return true;
}
return false;
}
public boolean acquireTaskGroupAgain(TaskGroupQueue taskGroupQueue) {
return robTaskGroupResouce(taskGroupQueue);
}
public void releaseAllTaskGroup(int processInstanceId) {
List<TaskInstance> taskInstances = this.taskInstanceMapper.loadAllInfosNoRelease(processInstanceId, TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode());
for (TaskInstance info : taskInstances) {
releaseTaskGroup(info);
}
}
/**
* release the TGQ resource when the corresponding task is finished.
*
* @return the result code and msg
*/
public TaskInstance releaseTaskGroup(TaskInstance taskInstance) {
TaskGroup taskGroup = taskGroupMapper.selectById(taskInstance.getTaskGroupId());
if (taskGroup == null) {
return null;
}
TaskGroupQueue thisTaskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskInstance.getId());
if (thisTaskGroupQueue.getStatus() == TaskGroupQueueStatus.RELEASE) {
return null; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
try {
while (taskGroupMapper.releaseTaskGroupResource(taskGroup.getId(), taskGroup.getUseSize()
, thisTaskGroupQueue.getId(), TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()) != 1) {
thisTaskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskInstance.getId());
if (thisTaskGroupQueue.getStatus() == TaskGroupQueueStatus.RELEASE) {
return null;
}
taskGroup = taskGroupMapper.selectById(taskInstance.getTaskGroupId());
}
} catch (Exception e) {
logger.error("release the task group error",e);
}
logger.info("updateTask:{}",taskInstance.getName());
changeTaskGroupQueueStatus(taskInstance.getId(), TaskGroupQueueStatus.RELEASE);
TaskGroupQueue taskGroupQueue = this.taskGroupQueueMapper.queryTheHighestPriorityTasks(taskGroup.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode(), Flag.NO.getCode(), Flag.NO.getCode());
if (taskGroupQueue == null) {
return null;
}
while (this.taskGroupQueueMapper.updateInQueueCAS(Flag.NO.getCode(), Flag.YES.getCode(), taskGroupQueue.getId()) != 1) {
taskGroupQueue = this.taskGroupQueueMapper.queryTheHighestPriorityTasks(taskGroup.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode(), Flag.NO.getCode(), Flag.NO.getCode());
if (taskGroupQueue == null) {
return null;
}
}
return this.taskInstanceMapper.selectById(taskGroupQueue.getTaskId());
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * release the TGQ resource when the corresponding task is finished.
*
* @param taskId task id
* @return the result code and msg
*/
public void changeTaskGroupQueueStatus(int taskId, TaskGroupQueueStatus status) {
TaskGroupQueue taskGroupQueue = taskGroupQueueMapper.queryByTaskId(taskId);
taskGroupQueue.setStatus(status);
taskGroupQueue.setUpdateTime(new Date(System.currentTimeMillis()));
taskGroupQueueMapper.updateById(taskGroupQueue);
}
/**
* insert into task group queue
*
* @param taskId task id
* @param taskName task name
* @param groupId group id
* @param processId process id
* @param priority priority
* @return result and msg code
*/
public TaskGroupQueue insertIntoTaskGroupQueue(Integer taskId,
String taskName, Integer groupId,
Integer processId, Integer priority, TaskGroupQueueStatus status) {
TaskGroupQueue taskGroupQueue = new TaskGroupQueue(taskId, taskName, groupId, processId, priority, status);
taskGroupQueue.setCreateTime(new Date());
taskGroupQueue.setUpdateTime(new Date());
taskGroupQueueMapper.insert(taskGroupQueue);
return taskGroupQueue;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public int updateTaskGroupQueueStatus(Integer taskId, int status) {
return taskGroupQueueMapper.updateStatusByTaskId(taskId, status);
}
public int updateTaskGroupQueue(TaskGroupQueue taskGroupQueue) {
return taskGroupQueueMapper.updateById(taskGroupQueue);
}
public TaskGroupQueue loadTaskGroupQueue(int taskId) {
return this.taskGroupQueueMapper.queryByTaskId(taskId);
}
public void sendStartTask2Master(ProcessInstance processInstance,int taskId,
org.apache.dolphinscheduler.remote.command.CommandType taskType) {
String host = processInstance.getHost();
String address = host.split(":")[0];
int port = Integer.parseInt(host.split(":")[1]);
TaskEventChangeCommand taskEventChangeCommand = new TaskEventChangeCommand(
processInstance.getId(), taskId
);
stateEventCallbackService.sendResult(address, port, taskEventChangeCommand.convert2Command(taskType));
}
public ProcessInstance loadNextProcess4Serial(long code, int state) {
return this.processInstanceMapper.loadNextProcess4Serial(code, state);
}
protected void deleteCommandWithCheck(int commandId) {
int delete = this.commandMapper.deleteById(commandId);
if (delete != 1) {
throw new ServiceException("delete command fail, id:" + commandId);
}
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.service.process;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_START_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
import static org.mockito.ArgumentMatchers.any;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ProcessExecutionTypeEnum;
import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.common.enums.WarningType; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.DqExecuteResult;
import org.apache.dolphinscheduler.dao.entity.DqRule;
import org.apache.dolphinscheduler.dao.entity.DqRuleExecuteSql;
import org.apache.dolphinscheduler.dao.entity.DqRuleInputEntry;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DqComparisonTypeMapper;
import org.apache.dolphinscheduler.dao.mapper.DqExecuteResultMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleExecuteSqlMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleInputEntryMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.ExecuteSqlType;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.InputType;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.OptionSourceType;
import org.apache.dolphinscheduler.plugin.task.api.enums.dp.ValueType;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.quartz.cron.CronUtilsTest;
import org.apache.dolphinscheduler.spi.params.base.FormType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.powermock.reflect.Whitebox;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
/**
* process service test
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class ProcessServiceTest {
private static final Logger logger = LoggerFactory.getLogger(CronUtilsTest.class);
@Rule
public final ExpectedException exception = ExpectedException.none();
@InjectMocks
private ProcessService processService;
@Mock
private CommandMapper commandMapper;
@Mock
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Mock
private ErrorCommandMapper errorCommandMapper;
@Mock
private ProcessDefinitionMapper processDefineMapper;
@Mock
private ProcessInstanceMapper processInstanceMapper;
@Mock
private UserMapper userMapper;
@Mock |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | private TaskInstanceMapper taskInstanceMapper;
@Mock
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Mock
private TaskDefinitionMapper taskDefinitionMapper;
@Mock
private ProcessTaskRelationMapper processTaskRelationMapper;
@Mock
private ProcessDefinitionLogMapper processDefineLogMapper;
@Mock
private ResourceMapper resourceMapper;
@Mock
private TaskGroupMapper taskGroupMapper;
@Mock
private TaskGroupQueueMapper taskGroupQueueMapper;
@Mock
private DqExecuteResultMapper dqExecuteResultMapper;
@Mock
private DqRuleMapper dqRuleMapper;
@Mock
private DqRuleInputEntryMapper dqRuleInputEntryMapper;
@Mock
private DqRuleExecuteSqlMapper dqRuleExecuteSqlMapper;
@Mock
private DqComparisonTypeMapper dqComparisonTypeMapper;
@Test
public void testCreateSubCommand() {
ProcessInstance parentInstance = new ProcessInstance();
parentInstance.setWarningType(WarningType.SUCCESS);
parentInstance.setWarningGroupId(0); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | TaskInstance task = new TaskInstance();
task.setTaskParams("{\"processDefinitionCode\":10}}");
task.setId(10);
task.setTaskCode(1L);
task.setTaskDefinitionVersion(1);
ProcessInstance childInstance = null;
ProcessInstanceMap instanceMap = new ProcessInstanceMap();
instanceMap.setParentProcessInstanceId(1);
instanceMap.setParentTaskInstanceId(10);
Command command;
parentInstance.setHistoryCmd("START_PROCESS");
parentInstance.setCommandType(CommandType.START_PROCESS);
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setCode(10L);
Mockito.when(processDefineMapper.queryByDefineId(100)).thenReturn(processDefinition);
Mockito.when(processDefineMapper.queryByCode(10L)).thenReturn(processDefinition);
command = processService.createSubProcessCommand(parentInstance, childInstance, instanceMap, task);
Assert.assertEquals(CommandType.START_PROCESS, command.getCommandType());
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS);
parentInstance.setHistoryCmd("START_PROCESS,START_FAILURE_TASK_PROCESS");
command = processService.createSubProcessCommand(parentInstance, childInstance, instanceMap, task);
Assert.assertEquals(CommandType.START_PROCESS, command.getCommandType());
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS);
parentInstance.setHistoryCmd("SCHEDULER,START_FAILURE_TASK_PROCESS");
command = processService.createSubProcessCommand(parentInstance, childInstance, instanceMap, task);
Assert.assertEquals(CommandType.SCHEDULER, command.getCommandType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | String startString = "2020-01-01 00:00:00";
String endString = "2020-01-10 00:00:00";
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS);
parentInstance.setHistoryCmd("COMPLEMENT_DATA,START_FAILURE_TASK_PROCESS");
Map<String, String> complementMap = new HashMap<>();
complementMap.put(Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE, startString);
complementMap.put(Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE, endString);
parentInstance.setCommandParam(JSONUtils.toJsonString(complementMap));
command = processService.createSubProcessCommand(parentInstance, childInstance, instanceMap, task);
Assert.assertEquals(CommandType.COMPLEMENT_DATA, command.getCommandType());
JsonNode complementDate = JSONUtils.parseObject(command.getCommandParam());
Date start = DateUtils.stringToDate(complementDate.get(Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE).asText());
Date end = DateUtils.stringToDate(complementDate.get(Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE).asText());
Assert.assertEquals(startString, DateUtils.dateToString(start));
Assert.assertEquals(endString, DateUtils.dateToString(end));
childInstance = new ProcessInstance();
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS);
parentInstance.setHistoryCmd("START_PROCESS,START_FAILURE_TASK_PROCESS");
command = processService.createSubProcessCommand(parentInstance, childInstance, instanceMap, task);
Assert.assertEquals(CommandType.START_FAILURE_TASK_PROCESS, command.getCommandType());
}
@Test
public void testVerifyIsNeedCreateCommand() {
List<Command> commands = new ArrayList<>();
Command command = new Command();
command.setCommandType(CommandType.REPEAT_RUNNING);
command.setCommandParam("{\"" + CMD_PARAM_RECOVER_PROCESS_ID_STRING + "\":\"111\"}");
commands.add(command);
Mockito.when(commandMapper.selectList(null)).thenReturn(commands); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | Assert.assertFalse(processService.verifyIsNeedCreateCommand(command));
Command command1 = new Command();
command1.setCommandType(CommandType.REPEAT_RUNNING);
command1.setCommandParam("{\"" + CMD_PARAM_RECOVER_PROCESS_ID_STRING + "\":\"222\"}");
Assert.assertTrue(processService.verifyIsNeedCreateCommand(command1));
Command command2 = new Command();
command2.setCommandType(CommandType.PAUSE);
Assert.assertTrue(processService.verifyIsNeedCreateCommand(command2));
}
@Test
public void testCreateRecoveryWaitingThreadCommand() {
int id = 123;
Mockito.when(commandMapper.deleteById(id)).thenReturn(1);
ProcessInstance subProcessInstance = new ProcessInstance();
subProcessInstance.setIsSubProcess(Flag.YES);
Command originCommand = new Command();
originCommand.setId(id);
processService.createRecoveryWaitingThreadCommand(originCommand, subProcessInstance);
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(111);
processService.createRecoveryWaitingThreadCommand(null, subProcessInstance);
Command recoverCommand = new Command();
recoverCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
processService.createRecoveryWaitingThreadCommand(recoverCommand, subProcessInstance);
Command repeatRunningCommand = new Command();
recoverCommand.setCommandType(CommandType.REPEAT_RUNNING);
processService.createRecoveryWaitingThreadCommand(repeatRunningCommand, subProcessInstance);
ProcessInstance subProcessInstance2 = new ProcessInstance();
subProcessInstance2.setId(111);
subProcessInstance2.setIsSubProcess(Flag.NO); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processService.createRecoveryWaitingThreadCommand(repeatRunningCommand, subProcessInstance2);
}
@Test
public void testHandleCommand() {
String host = "127.0.0.1";
Command command = new Command();
command.setProcessDefinitionCode(222);
command.setCommandType(CommandType.REPEAT_RUNNING);
command.setCommandParam("{\"" + CMD_PARAM_RECOVER_PROCESS_ID_STRING + "\":\"111\",\""
+ CMD_PARAM_SUB_PROCESS_DEFINE_CODE + "\":\"222\"}");
Assert.assertNull(processService.handleCommand(logger, host, command));
int definitionVersion = 1;
long definitionCode = 123;
int processInstanceId = 222;
Command command1 = new Command();
command1.setId(1);
command1.setProcessDefinitionCode(definitionCode);
command1.setProcessDefinitionVersion(definitionVersion);
command1.setCommandParam("{\"ProcessInstanceId\":222}");
command1.setCommandType(CommandType.START_PROCESS);
Mockito.when(commandMapper.deleteById(1)).thenReturn(1);
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setId(123);
processDefinition.setName("test");
processDefinition.setVersion(definitionVersion);
processDefinition.setCode(definitionCode);
processDefinition.setGlobalParams("[{\"prop\":\"startParam1\",\"direct\":\"IN\",\"type\":\"VARCHAR\",\"value\":\"\"}]");
processDefinition.setExecutionType(ProcessExecutionTypeEnum.PARALLEL); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(222);
processInstance.setProcessDefinitionCode(11L);
processInstance.setHost("127.0.0.1:5678");
processInstance.setProcessDefinitionVersion(1);
processInstance.setId(processInstanceId);
processInstance.setProcessDefinitionCode(definitionCode);
processInstance.setProcessDefinitionVersion(definitionVersion);
Mockito.when(processDefineMapper.queryByCode(command1.getProcessDefinitionCode())).thenReturn(processDefinition);
Mockito.when(processDefineLogMapper.queryByDefinitionCodeAndVersion(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion())).thenReturn(new ProcessDefinitionLog(processDefinition));
Mockito.when(processInstanceMapper.queryDetailById(222)).thenReturn(processInstance);
Assert.assertNotNull(processService.handleCommand(logger, host, command1));
Command command2 = new Command();
command2.setId(2);
command2.setCommandParam("{\"ProcessInstanceId\":222,\"StartNodeIdList\":\"n1,n2\"}");
command2.setProcessDefinitionCode(definitionCode);
command2.setProcessDefinitionVersion(definitionVersion);
command2.setCommandType(CommandType.RECOVER_SUSPENDED_PROCESS);
command2.setProcessInstanceId(processInstanceId);
Mockito.when(commandMapper.deleteById(2)).thenReturn(1);
Assert.assertNotNull(processService.handleCommand(logger, host, command2));
Command command3 = new Command();
command3.setId(3);
command3.setProcessDefinitionCode(definitionCode);
command3.setProcessDefinitionVersion(definitionVersion);
command3.setProcessInstanceId(processInstanceId);
command3.setCommandParam("{\"WaitingThreadInstanceId\":222}");
command3.setCommandType(CommandType.START_FAILURE_TASK_PROCESS);
Mockito.when(commandMapper.deleteById(3)).thenReturn(1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | Assert.assertNotNull(processService.handleCommand(logger, host, command3));
Command command4 = new Command();
command4.setId(4);
command4.setProcessDefinitionCode(definitionCode);
command4.setProcessDefinitionVersion(definitionVersion);
command4.setCommandParam("{\"WaitingThreadInstanceId\":222,\"StartNodeIdList\":\"n1,n2\"}");
command4.setCommandType(CommandType.REPEAT_RUNNING);
command4.setProcessInstanceId(processInstanceId);
Mockito.when(commandMapper.deleteById(4)).thenReturn(1);
Assert.assertNotNull(processService.handleCommand(logger, host, command4));
Command command5 = new Command();
command5.setId(5);
command5.setProcessDefinitionCode(definitionCode);
command5.setProcessDefinitionVersion(definitionVersion);
HashMap<String, String> startParams = new HashMap<>();
startParams.put("startParam1", "testStartParam1");
HashMap<String, String> commandParams = new HashMap<>();
commandParams.put(CMD_PARAM_START_PARAMS, JSONUtils.toJsonString(startParams));
command5.setCommandParam(JSONUtils.toJsonString(commandParams));
command5.setCommandType(CommandType.START_PROCESS);
command5.setDryRun(Constants.DRY_RUN_FLAG_NO);
Mockito.when(commandMapper.deleteById(5)).thenReturn(1);
ProcessInstance processInstance1 = processService.handleCommand(logger, host, command5);
Assert.assertTrue(processInstance1.getGlobalParams().contains("\"testStartParam1\""));
ProcessDefinition processDefinition1 = new ProcessDefinition();
processDefinition1.setId(123);
processDefinition1.setName("test");
processDefinition1.setVersion(1);
processDefinition1.setCode(11L);
processDefinition1.setVersion(1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processDefinition1.setExecutionType(ProcessExecutionTypeEnum.SERIAL_WAIT);
List<ProcessInstance> lists = new ArrayList<>();
ProcessInstance processInstance11 = new ProcessInstance();
processInstance11.setId(222);
processInstance11.setProcessDefinitionCode(11L);
processInstance11.setProcessDefinitionVersion(1);
processInstance11.setHost("127.0.0.1:5678");
lists.add(processInstance11);
ProcessInstance processInstance2 = new ProcessInstance();
processInstance2.setId(223);
processInstance2.setProcessDefinitionCode(11L);
processInstance2.setProcessDefinitionVersion(1);
Mockito.when(processInstanceMapper.queryDetailById(223)).thenReturn(processInstance2);
Mockito.when(processDefineMapper.queryByCode(11L)).thenReturn(processDefinition1);
Mockito.when(commandMapper.deleteById(1)).thenReturn(1);
Assert.assertNotNull(processService.handleCommand(logger, host, command1));
Command command6 = new Command();
command6.setId(6);
command6.setProcessDefinitionCode(11L);
command6.setCommandParam("{\"ProcessInstanceId\":223}");
command6.setCommandType(CommandType.RECOVER_SERIAL_WAIT);
command6.setProcessDefinitionVersion(1);
Mockito.when(processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(11L, Constants.RUNNING_PROCESS_STATE, 223)).thenReturn(lists);
Mockito.when(processInstanceMapper.updateNextProcessIdById(223, 222)).thenReturn(true);
Mockito.when(commandMapper.deleteById(6)).thenReturn(1);
ProcessInstance processInstance6 = processService.handleCommand(logger, host, command6);
Assert.assertTrue(processInstance6 != null);
processDefinition1.setExecutionType(ProcessExecutionTypeEnum.SERIAL_DISCARD);
Mockito.when(processDefineMapper.queryByCode(11L)).thenReturn(processDefinition1);
ProcessInstance processInstance7 = new ProcessInstance(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processInstance7.setId(224);
processInstance7.setProcessDefinitionCode(11L);
processInstance7.setProcessDefinitionVersion(1);
Mockito.when(processInstanceMapper.queryDetailById(224)).thenReturn(processInstance7);
Command command7 = new Command();
command7.setId(7);
command7.setProcessDefinitionCode(11L);
command7.setCommandParam("{\"ProcessInstanceId\":224}");
command7.setCommandType(CommandType.RECOVER_SERIAL_WAIT);
command7.setProcessDefinitionVersion(1);
Mockito.when(commandMapper.deleteById(7)).thenReturn(1);
Mockito.when(processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(11L, Constants.RUNNING_PROCESS_STATE, 224)).thenReturn(null);
ProcessInstance processInstance8 = processService.handleCommand(logger, host, command7);
Assert.assertTrue(processInstance8 == null);
ProcessDefinition processDefinition2 = new ProcessDefinition();
processDefinition2.setId(123);
processDefinition2.setName("test");
processDefinition2.setVersion(1);
processDefinition2.setCode(12L);
processDefinition2.setExecutionType(ProcessExecutionTypeEnum.SERIAL_PRIORITY);
Mockito.when(processDefineMapper.queryByCode(12L)).thenReturn(processDefinition2);
ProcessInstance processInstance9 = new ProcessInstance();
processInstance9.setId(225);
processInstance9.setProcessDefinitionCode(11L);
processInstance9.setProcessDefinitionVersion(1);
Command command9 = new Command();
command9.setId(9);
command9.setProcessDefinitionCode(12L);
command9.setCommandParam("{\"ProcessInstanceId\":225}");
command9.setCommandType(CommandType.RECOVER_SERIAL_WAIT); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | command9.setProcessDefinitionVersion(1);
Mockito.when(processInstanceMapper.queryDetailById(225)).thenReturn(processInstance9);
Mockito.when(processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(12L, Constants.RUNNING_PROCESS_STATE, 0)).thenReturn(lists);
Mockito.when(processInstanceMapper.updateById(processInstance)).thenReturn(1);
Mockito.when(commandMapper.deleteById(9)).thenReturn(1);
ProcessInstance processInstance10 = processService.handleCommand(logger, host, command9);
Assert.assertTrue(processInstance10 == null);
}
@Test(expected = ServiceException.class)
public void testDeleteNotExistCommand() {
String host = "127.0.0.1";
int definitionVersion = 1;
long definitionCode = 123;
int processInstanceId = 222;
Command command1 = new Command();
command1.setId(1);
command1.setProcessDefinitionCode(definitionCode);
command1.setProcessDefinitionVersion(definitionVersion);
command1.setCommandParam("{\"ProcessInstanceId\":222}");
command1.setCommandType(CommandType.START_PROCESS);
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setId(123);
processDefinition.setName("test");
processDefinition.setVersion(definitionVersion);
processDefinition.setCode(definitionCode);
processDefinition.setGlobalParams("[{\"prop\":\"startParam1\",\"direct\":\"IN\",\"type\":\"VARCHAR\",\"value\":\"\"}]");
processDefinition.setExecutionType(ProcessExecutionTypeEnum.PARALLEL);
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(222);
processInstance.setProcessDefinitionCode(11L); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processInstance.setHost("127.0.0.1:5678");
processInstance.setProcessDefinitionVersion(1);
processInstance.setId(processInstanceId);
processInstance.setProcessDefinitionCode(definitionCode);
processInstance.setProcessDefinitionVersion(definitionVersion);
Mockito.when(processDefineMapper.queryByCode(command1.getProcessDefinitionCode())).thenReturn(processDefinition);
Mockito.when(processDefineLogMapper.queryByDefinitionCodeAndVersion(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion())).thenReturn(new ProcessDefinitionLog(processDefinition));
Mockito.when(processInstanceMapper.queryDetailById(222)).thenReturn(processInstance);
processService.handleCommand(logger, host, command1);
}
@Test
public void testGetUserById() {
User user = new User();
user.setId(123);
Mockito.when(userMapper.selectById(123)).thenReturn(user);
Assert.assertEquals(user, processService.getUserById(123));
}
@Test
public void testFormatTaskAppId() {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setId(333);
taskInstance.setProcessInstanceId(222);
Mockito.when(processService.findProcessInstanceById(taskInstance.getProcessInstanceId())).thenReturn(null);
Assert.assertEquals("", processService.formatTaskAppId(taskInstance));
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setId(111);
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(222); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processInstance.setProcessDefinitionVersion(1);
processInstance.setProcessDefinitionCode(1L);
Mockito.when(processService.findProcessInstanceById(taskInstance.getProcessInstanceId())).thenReturn(processInstance);
Assert.assertEquals("", processService.formatTaskAppId(taskInstance));
}
@Test
public void testRecurseFindSubProcessId() {
int parentProcessDefineId = 1;
long parentProcessDefineCode = 1L;
int parentProcessDefineVersion = 1;
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setCode(parentProcessDefineCode);
processDefinition.setVersion(parentProcessDefineVersion);
Mockito.when(processDefineMapper.selectById(parentProcessDefineId)).thenReturn(processDefinition);
long postTaskCode = 2L;
int postTaskVersion = 2;
List<ProcessTaskRelationLog> relationLogList = new ArrayList<>();
ProcessTaskRelationLog processTaskRelationLog = new ProcessTaskRelationLog();
processTaskRelationLog.setPostTaskCode(postTaskCode);
processTaskRelationLog.setPostTaskVersion(postTaskVersion);
relationLogList.add(processTaskRelationLog);
Mockito.when(processTaskRelationLogMapper.queryByProcessCodeAndVersion(parentProcessDefineCode
, parentProcessDefineVersion)).thenReturn(relationLogList);
List<TaskDefinitionLog> taskDefinitionLogs = new ArrayList<>();
TaskDefinitionLog taskDefinitionLog1 = new TaskDefinitionLog();
taskDefinitionLog1.setTaskParams("{\"processDefinitionCode\": 123L}");
taskDefinitionLogs.add(taskDefinitionLog1);
Mockito.when(taskDefinitionLogMapper.queryByTaskDefinitions(Mockito.anySet())).thenReturn(taskDefinitionLogs);
List<Long> ids = new ArrayList<>();
processService.recurseFindSubProcess(parentProcessDefineCode, ids); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | Assert.assertEquals(0, ids.size());
}
@Test
public void testSwitchVersion() {
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setCode(1L);
processDefinition.setProjectCode(1L);
processDefinition.setId(123);
processDefinition.setName("test");
processDefinition.setVersion(1);
ProcessDefinitionLog processDefinitionLog = new ProcessDefinitionLog();
processDefinitionLog.setCode(1L);
processDefinitionLog.setVersion(2);
Assert.assertEquals(0, processService.switchVersion(processDefinition, processDefinitionLog));
}
@Test
public void getDqRule() {
Mockito.when(dqRuleMapper.selectById(1)).thenReturn(new DqRule());
Assert.assertNotNull(processService.getDqRule(1));
}
@Test
public void getRuleInputEntry() {
Mockito.when(dqRuleInputEntryMapper.getRuleInputEntryList(1)).thenReturn(getRuleInputEntryList());
Assert.assertNotNull(processService.getRuleInputEntry(1));
}
@Test
public void getDqExecuteSql() {
Mockito.when(dqRuleExecuteSqlMapper.getExecuteSqlList(1)).thenReturn(getRuleExecuteSqlList());
Assert.assertNotNull(processService.getDqExecuteSql(1));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | private List<DqRuleInputEntry> getRuleInputEntryList() {
List<DqRuleInputEntry> list = new ArrayList<>();
DqRuleInputEntry srcConnectorType = new DqRuleInputEntry();
srcConnectorType.setTitle("源数据类型");
srcConnectorType.setField("src_connector_type");
srcConnectorType.setType(FormType.SELECT.getFormType());
srcConnectorType.setCanEdit(true);
srcConnectorType.setShow(true);
srcConnectorType.setValue("JDBC");
srcConnectorType.setPlaceholder("Please select the source connector type");
srcConnectorType.setOptionSourceType(OptionSourceType.DEFAULT.getCode());
srcConnectorType.setOptions("[{\"label\":\"HIVE\",\"value\":\"HIVE\"},{\"label\":\"JDBC\",\"value\":\"JDBC\"}]");
srcConnectorType.setInputType(InputType.DEFAULT.getCode());
srcConnectorType.setValueType(ValueType.NUMBER.getCode());
srcConnectorType.setEmit(true);
DqRuleInputEntry statisticsName = new DqRuleInputEntry();
statisticsName.setTitle("统计值名");
statisticsName.setField("statistics_name");
statisticsName.setType(FormType.INPUT.getFormType());
statisticsName.setCanEdit(true);
statisticsName.setShow(true);
statisticsName.setPlaceholder("Please enter statistics name, the alias in statistics execute sql");
statisticsName.setOptionSourceType(OptionSourceType.DEFAULT.getCode());
statisticsName.setInputType(InputType.DEFAULT.getCode());
statisticsName.setValueType(ValueType.STRING.getCode());
statisticsName.setEmit(false);
DqRuleInputEntry statisticsExecuteSql = new DqRuleInputEntry();
statisticsExecuteSql.setTitle("统计值计算SQL");
statisticsExecuteSql.setField("statistics_execute_sql");
statisticsExecuteSql.setType(FormType.TEXTAREA.getFormType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | statisticsExecuteSql.setCanEdit(true);
statisticsExecuteSql.setShow(true);
statisticsExecuteSql.setPlaceholder("Please enter the statistics execute sql");
statisticsExecuteSql.setOptionSourceType(OptionSourceType.DEFAULT.getCode());
statisticsExecuteSql.setValueType(ValueType.LIKE_SQL.getCode());
statisticsExecuteSql.setEmit(false);
list.add(srcConnectorType);
list.add(statisticsName);
list.add(statisticsExecuteSql);
return list;
}
private List<DqRuleExecuteSql> getRuleExecuteSqlList() {
List<DqRuleExecuteSql> list = new ArrayList<>();
DqRuleExecuteSql executeSqlDefinition = new DqRuleExecuteSql();
executeSqlDefinition.setIndex(0);
executeSqlDefinition.setSql("SELECT COUNT(*) AS total FROM ${src_table} WHERE (${src_filter})");
executeSqlDefinition.setTableAlias("total_count");
executeSqlDefinition.setType(ExecuteSqlType.COMPARISON.getCode());
list.add(executeSqlDefinition);
return list;
}
public DqExecuteResult getExecuteResult() {
DqExecuteResult dqExecuteResult = new DqExecuteResult();
dqExecuteResult.setId(1);
dqExecuteResult.setState(DqTaskState.FAILURE.getCode());
return dqExecuteResult;
}
public List<DqExecuteResult> getExecuteResultList() {
List<DqExecuteResult> list = new ArrayList<>();
DqExecuteResult dqExecuteResult = new DqExecuteResult(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | dqExecuteResult.setId(1);
dqExecuteResult.setState(DqTaskState.FAILURE.getCode());
list.add(dqExecuteResult);
return list;
}
public void testSaveTaskDefine() {
User operator = new User();
operator.setId(-1);
operator.setUserType(UserType.GENERAL_USER);
long projectCode = 751485690568704L;
String taskJson = "[{\"code\":751500437479424,\"name\":\"aa\",\"version\":1,\"description\":\"\",\"delayTime\":0,"
+ "\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"sleep 1s\\necho 11\","
+ "\"dependence\":{},\"conditionResult\":{\"successNode\":[\"\"],\"failedNode\":[\"\"]},\"waitStartTimeout\":{}},"
+ "\"flag\":\"YES\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"yarn\",\"failRetryTimes\":0,\"failRetryInterval\":1,"
+ "\"timeoutFlag\":\"OPEN\",\"timeoutNotifyStrategy\":\"FAILED\",\"timeout\":1,\"environmentCode\":751496815697920},"
+ "{\"code\":751516889636864,\"name\":\"bb\",\"description\":\"\",\"taskType\":\"SHELL\",\"taskParams\":{\"resourceList\":[],"
+ "\"localParams\":[],\"rawScript\":\"echo 22\",\"dependence\":{},\"conditionResult\":{\"successNode\":[\"\"],\"failedNode\":[\"\"]},"
+ "\"waitStartTimeout\":{}},\"flag\":\"YES\",\"taskPriority\":\"MEDIUM\",\"workerGroup\":\"default\",\"failRetryTimes\":\"0\","
+ "\"failRetryInterval\":\"1\",\"timeoutFlag\":\"CLOSE\",\"timeoutNotifyStrategy\":\"\",\"timeout\":0,\"delayTime\":\"0\",\"environmentCode\":-1}]";
List<TaskDefinitionLog> taskDefinitionLogs = JSONUtils.toList(taskJson, TaskDefinitionLog.class);
TaskDefinitionLog taskDefinition = new TaskDefinitionLog();
taskDefinition.setCode(751500437479424L);
taskDefinition.setName("aa");
taskDefinition.setProjectCode(751485690568704L);
taskDefinition.setTaskType("SHELL");
taskDefinition.setUserId(-1);
taskDefinition.setVersion(1);
taskDefinition.setCreateTime(new Date());
taskDefinition.setUpdateTime(new Date());
Mockito.when(taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskDefinition.getCode(), taskDefinition.getVersion())).thenReturn(taskDefinition); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | Mockito.when(taskDefinitionLogMapper.queryMaxVersionForDefinition(taskDefinition.getCode())).thenReturn(1);
Mockito.when(taskDefinitionMapper.queryByCode(taskDefinition.getCode())).thenReturn(taskDefinition);
int result = processService.saveTaskDefine(operator, projectCode, taskDefinitionLogs, Boolean.TRUE);
Assert.assertEquals(0, result);
}
@Test
public void testGenDagGraph() {
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setCode(1L);
processDefinition.setId(123);
processDefinition.setName("test");
processDefinition.setVersion(1);
processDefinition.setCode(11L);
ProcessTaskRelationLog processTaskRelation = new ProcessTaskRelationLog();
processTaskRelation.setName("def 1");
processTaskRelation.setProcessDefinitionVersion(1);
processTaskRelation.setProjectCode(1L);
processTaskRelation.setProcessDefinitionCode(1L);
processTaskRelation.setPostTaskCode(3L);
processTaskRelation.setPreTaskCode(2L);
processTaskRelation.setUpdateTime(new Date());
processTaskRelation.setCreateTime(new Date());
List<ProcessTaskRelationLog> list = new ArrayList<>();
list.add(processTaskRelation);
TaskDefinitionLog taskDefinition = new TaskDefinitionLog();
taskDefinition.setCode(3L);
taskDefinition.setName("1-test");
taskDefinition.setProjectCode(1L);
taskDefinition.setTaskType("SHELL");
taskDefinition.setUserId(1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | taskDefinition.setVersion(2);
taskDefinition.setCreateTime(new Date());
taskDefinition.setUpdateTime(new Date());
TaskDefinitionLog td2 = new TaskDefinitionLog();
td2.setCode(2L);
td2.setName("unit-test");
td2.setProjectCode(1L);
td2.setTaskType("SHELL");
td2.setUserId(1);
td2.setVersion(1);
td2.setCreateTime(new Date());
td2.setUpdateTime(new Date());
List<TaskDefinitionLog> taskDefinitionLogs = new ArrayList<>();
taskDefinitionLogs.add(taskDefinition);
taskDefinitionLogs.add(td2);
Mockito.when(taskDefinitionLogMapper.queryByTaskDefinitions(any())).thenReturn(taskDefinitionLogs);
Mockito.when(processTaskRelationLogMapper.queryByProcessCodeAndVersion(Mockito.anyLong(), Mockito.anyInt())).thenReturn(list);
DAG<String, TaskNode, TaskNodeRelation> stringTaskNodeTaskNodeRelationDAG = processService.genDagGraph(processDefinition);
Assert.assertEquals(1, stringTaskNodeTaskNodeRelationDAG.getNodesCount());
}
@Test
public void testCreateCommand() {
Command command = new Command();
command.setProcessDefinitionCode(123);
command.setCommandParam("{\"ProcessInstanceId\":222}");
command.setCommandType(CommandType.START_PROCESS);
int mockResult = 1;
Mockito.when(commandMapper.insert(command)).thenReturn(mockResult);
int exeMethodResult = processService.createCommand(command);
Assert.assertEquals(mockResult, exeMethodResult); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | Mockito.verify(commandMapper, Mockito.times(1)).insert(command);
}
@Test
public void testChangeOutParam() {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setProcessInstanceId(62);
ProcessInstance processInstance = new ProcessInstance();
processInstance.setId(62);
taskInstance.setVarPool("[{\"direct\":\"OUT\",\"prop\":\"test1\",\"type\":\"VARCHAR\",\"value\":\"\"}]");
taskInstance.setTaskParams("{\"type\":\"MYSQL\",\"datasource\":1,\"sql\":\"select id from tb_test limit 1\","
+ "\"udfs\":\"\",\"sqlType\":\"0\",\"sendEmail\":false,\"displayRows\":10,\"title\":\"\","
+ "\"groupId\":null,\"localParams\":[{\"prop\":\"test1\",\"direct\":\"OUT\",\"type\":\"VARCHAR\",\"value\":\"12\"}],"
+ "\"connParams\":\"\",\"preStatements\":[],\"postStatements\":[],\"conditionResult\":\"{\\\"successNode\\\":[\\\"\\\"],"
+ "\\\"failedNode\\\":[\\\"\\\"]}\",\"dependence\":\"{}\"}");
processService.changeOutParam(taskInstance);
}
@Test
public void testUpdateResourceInfo() throws Exception {
// test if input is null
ceInfoNull = null;
ResourceInfo updatedResourceInfo1 = Whitebox.invokeMethod(processService,
"updateResourceInfo",
resourceInfoNull);
Assert.assertNull(updatedResourceInfo1);
// test if resource id less than 1
ceInfoVoid = new ResourceInfo();
ResourceInfo updatedResourceInfo2 = Whitebox.invokeMethod(processService,
"updateResourceInfo",
resourceInfoVoid);
Assert.assertNull(updatedResourceInfo2); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | // test normal situation
ceInfoNormal = new ResourceInfo();
resourceInfoNormal.setId(1);
Resource resource = new Resource();
resource.setId(1);
resource.setFileName("test.txt");
resource.setFullName("/test.txt");
Mockito.when(resourceMapper.selectById(1)).thenReturn(resource);
ResourceInfo updatedResourceInfo3 = Whitebox.invokeMethod(processService,
"updateResourceInfo",
resourceInfoNormal);
Assert.assertEquals(1, updatedResourceInfo3.getId());
Assert.assertEquals("test.txt", updatedResourceInfo3.getRes());
Assert.assertEquals("/test.txt", updatedResourceInfo3.getResourceName());
}
@Test
public void testCreateTaskGroupQueue() {
Mockito.when(taskGroupQueueMapper.insert(Mockito.any(TaskGroupQueue.class))).thenReturn(1);
TaskGroupQueue taskGroupQueue = processService.insertIntoTaskGroupQueue(1, "task name", 1, 1, 1, TaskGroupQueueStatus.WAIT_QUEUE);
Assert.assertNotNull(taskGroupQueue);
}
@Test
public void testDoRelease() {
TaskGroupQueue taskGroupQueue = getTaskGroupQueue();
TaskInstance taskInstance = new TaskInstance();
taskInstance.setId(1);
taskInstance.setProcessInstanceId(1);
taskInstance.setTaskGroupId(taskGroupQueue.getGroupId());
Mockito.when(taskGroupQueueMapper.queryByTaskId(1)).thenReturn(taskGroupQueue);
Mockito.when(taskGroupQueueMapper.updateById(taskGroupQueue)).thenReturn(1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,227 | [Improvement][Master] use the slot to scan the database | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
When the master assigns tasks by slot, it is inefficient to obtain commands by cyclically scanning the database.
Can we use the slot to scan the database?
I have an idea.
such as:
select * from t_ds_command where id % masterCount = thisMasterSlot;
the masterCount and thisMasterSlot is the parameter
（Associate org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService）
### Use case
Improve the efficiency of the master assigning tasks through slots
### Related issues
_No response_
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9227 | https://github.com/apache/dolphinscheduler/pull/9228 | 263791a63e4b85f96563eda51704816d2c38e600 | d3251c9bcc5744905723df7fab11a676029e7d6e | 2022-03-27T16:04:51Z | java | 2022-03-28T01:52:12Z | dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java | processService.releaseTaskGroup(taskInstance);
}
@Test
public void testFindTaskInstanceByIdList() {
List<Integer> emptyList = new ArrayList<>();
Mockito.when(taskInstanceMapper.selectBatchIds(emptyList)).thenReturn(new ArrayList<>());
Assert.assertEquals(0, processService.findTaskInstanceByIdList(emptyList).size());
List<Integer> idList = Collections.singletonList(1);
TaskInstance instance = new TaskInstance();
instance.setId(1);
Mockito.when(taskInstanceMapper.selectBatchIds(idList)).thenReturn(Collections.singletonList(instance));
List<TaskInstance> taskInstanceByIdList = processService.findTaskInstanceByIdList(idList);
Assert.assertEquals(1, taskInstanceByIdList.size());
Assert.assertEquals(instance.getId(), taskInstanceByIdList.get(0).getId());
}
private TaskGroupQueue getTaskGroupQueue() {
TaskGroupQueue taskGroupQueue = new TaskGroupQueue();
taskGroupQueue.setTaskName("task name");
taskGroupQueue.setId(1);
taskGroupQueue.setGroupId(1);
taskGroupQueue.setTaskId(1);
taskGroupQueue.setPriority(1);
taskGroupQueue.setStatus(TaskGroupQueueStatus.ACQUIRE_SUCCESS);
Date date = new Date(System.currentTimeMillis());
taskGroupQueue.setUpdateTime(date);
taskGroupQueue.setCreateTime(date);
return taskGroupQueue;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.api.enums; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | import org.springframework.context.i18n.LocaleContextHolder;
import java.util.Locale;
import java.util.Optional;
/**
* status enum // todo #4855 One category one interval
*/
public enum Status {
SUCCESS(0, "success", "成功"),
INTERNAL_SERVER_ERROR_ARGS(10000, "Internal Server Error: {0}", "服务端异常: {0}"),
REQUEST_PARAMS_NOT_VALID_ERROR(10001, "request parameter {0} is not valid", "请求参数[{0}]无效"),
TASK_TIMEOUT_PARAMS_ERROR(10002, "task timeout parameter is not valid", "任务超时参数无效"),
USER_NAME_EXIST(10003, "user name already exists", "用户名已存在"),
USER_NAME_NULL(10004, "user name is null", "用户名不能为空"),
HDFS_OPERATION_ERROR(10006, "hdfs operation error", "hdfs操作错误"),
TASK_INSTANCE_NOT_FOUND(10008, "task instance not found", "任务实例不存在"),
OS_TENANT_CODE_EXIST(10009, "os tenant code {0} already exists", "操作系统租户[{0}]已存在"),
USER_NOT_EXIST(10010, "user {0} not exists", "用户[{0}]不存在"),
ALERT_GROUP_NOT_EXIST(10011, "alarm group not found", "告警组不存在"),
ALERT_GROUP_EXIST(10012, "alarm group already exists", "告警组名称已存在"),
USER_NAME_PASSWD_ERROR(10013, "user name or password error", "用户名或密码错误"),
LOGIN_SESSION_FAILED(10014, "create session failed!", "创建session失败"),
DATASOURCE_EXIST(10015, "data source name already exists", "数据源名称已存在"),
DATASOURCE_CONNECT_FAILED(10016, "data source connection failed", "建立数据源连接失败"),
TENANT_NOT_EXIST(10017, "tenant not exists", "租户不存在"),
PROJECT_NOT_FOUND(10018, "project {0} not found ", "项目[{0}]不存在"),
PROJECT_ALREADY_EXISTS(10019, "project {0} already exists", "项目名称[{0}]已存在"),
TASK_INSTANCE_NOT_EXISTS(10020, "task instance {0} does not exist", "任务实例[{0}]不存在"),
TASK_INSTANCE_NOT_SUB_WORKFLOW_INSTANCE(10021, "task instance {0} is not sub process instance", "任务实例[{0}]不是子流程实例"),
SCHEDULE_CRON_NOT_EXISTS(10022, "scheduler crontab {0} does not exist", "调度配置定时表达式[{0}]不存在"),
SCHEDULE_CRON_ONLINE_FORBID_UPDATE(10023, "online status does not allow update operations", "调度配置上线状态不允许修改"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | SCHEDULE_CRON_CHECK_FAILED(10024, "scheduler crontab expression validation failure: {0}", "调度配置定时表达式验证失败: {0}"),
MASTER_NOT_EXISTS(10025, "master does not exist", "无可用master节点"),
SCHEDULE_STATUS_UNKNOWN(10026, "unknown status: {0}", "未知状态: {0}"),
CREATE_ALERT_GROUP_ERROR(10027, "create alert group error", "创建告警组错误"),
QUERY_ALL_ALERTGROUP_ERROR(10028, "query all alertgroup error", "查询告警组错误"),
LIST_PAGING_ALERT_GROUP_ERROR(10029, "list paging alert group error", "分页查询告警组错误"),
UPDATE_ALERT_GROUP_ERROR(10030, "update alert group error", "更新告警组错误"),
DELETE_ALERT_GROUP_ERROR(10031, "delete alert group error", "删除告警组错误"),
ALERT_GROUP_GRANT_USER_ERROR(10032, "alert group grant user error", "告警组授权用户错误"),
CREATE_DATASOURCE_ERROR(10033, "create datasource error", "创建数据源错误"),
UPDATE_DATASOURCE_ERROR(10034, "update datasource error", "更新数据源错误"),
QUERY_DATASOURCE_ERROR(10035, "query datasource error", "查询数据源错误"),
CONNECT_DATASOURCE_FAILURE(10036, "connect datasource failure", "建立数据源连接失败"),
CONNECTION_TEST_FAILURE(10037, "connection test failure", "测试数据源连接失败"),
DELETE_DATA_SOURCE_FAILURE(10038, "delete data source failure", "删除数据源失败"),
VERIFY_DATASOURCE_NAME_FAILURE(10039, "verify datasource name failure", "验证数据源名称失败"),
UNAUTHORIZED_DATASOURCE(10040, "unauthorized datasource", "未经授权的数据源"),
AUTHORIZED_DATA_SOURCE(10041, "authorized data source", "授权数据源失败"),
LOGIN_SUCCESS(10042, "login success", "登录成功"),
USER_LOGIN_FAILURE(10043, "user login failure", "用户登录失败"),
LIST_WORKERS_ERROR(10044, "list workers error", "查询worker列表错误"),
LIST_MASTERS_ERROR(10045, "list masters error", "查询master列表错误"),
UPDATE_PROJECT_ERROR(10046, "update project error", "更新项目信息错误"),
QUERY_PROJECT_DETAILS_BY_CODE_ERROR(10047, "query project details by code error", "查询项目详细信息错误"),
CREATE_PROJECT_ERROR(10048, "create project error", "创建项目错误"),
LOGIN_USER_QUERY_PROJECT_LIST_PAGING_ERROR(10049, "login user query project list paging error", "分页查询项目列表错误"),
DELETE_PROJECT_ERROR(10050, "delete project error", "删除项目错误"),
QUERY_UNAUTHORIZED_PROJECT_ERROR(10051, "query unauthorized project error", "查询未授权项目错误"),
QUERY_AUTHORIZED_PROJECT(10052, "query authorized project", "查询授权项目错误"),
QUERY_QUEUE_LIST_ERROR(10053, "query queue list error", "查询队列列表错误"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | CREATE_RESOURCE_ERROR(10054, "create resource error", "创建资源错误"),
UPDATE_RESOURCE_ERROR(10055, "update resource error", "更新资源错误"),
QUERY_RESOURCES_LIST_ERROR(10056, "query resources list error", "查询资源列表错误"),
QUERY_RESOURCES_LIST_PAGING(10057, "query resources list paging", "分页查询资源列表错误"),
DELETE_RESOURCE_ERROR(10058, "delete resource error", "删除资源错误"),
VERIFY_RESOURCE_BY_NAME_AND_TYPE_ERROR(10059, "verify resource by name and type error", "资源名称或类型验证错误"),
VIEW_RESOURCE_FILE_ON_LINE_ERROR(10060, "view resource file online error", "查看资源文件错误"),
CREATE_RESOURCE_FILE_ON_LINE_ERROR(10061, "create resource file online error", "创建资源文件错误"),
RESOURCE_FILE_IS_EMPTY(10062, "resource file is empty", "资源文件内容不能为空"),
EDIT_RESOURCE_FILE_ON_LINE_ERROR(10063, "edit resource file online error", "更新资源文件错误"),
DOWNLOAD_RESOURCE_FILE_ERROR(10064, "download resource file error", "下载资源文件错误"),
CREATE_UDF_FUNCTION_ERROR(10065, "create udf function error", "创建UDF函数错误"),
VIEW_UDF_FUNCTION_ERROR(10066, "view udf function error", "查询UDF函数错误"),
UPDATE_UDF_FUNCTION_ERROR(10067, "update udf function error", "更新UDF函数错误"),
QUERY_UDF_FUNCTION_LIST_PAGING_ERROR(10068, "query udf function list paging error", "分页查询UDF函数列表错误"),
QUERY_DATASOURCE_BY_TYPE_ERROR(10069, "query datasource by type error", "查询数据源信息错误"),
VERIFY_UDF_FUNCTION_NAME_ERROR(10070, "verify udf function name error", "UDF函数名称验证错误"),
DELETE_UDF_FUNCTION_ERROR(10071, "delete udf function error", "删除UDF函数错误"),
AUTHORIZED_FILE_RESOURCE_ERROR(10072, "authorized file resource error", "授权资源文件错误"),
AUTHORIZE_RESOURCE_TREE(10073, "authorize resource tree display error", "授权资源目录树错误"),
UNAUTHORIZED_UDF_FUNCTION_ERROR(10074, "unauthorized udf function error", "查询未授权UDF函数错误"),
AUTHORIZED_UDF_FUNCTION_ERROR(10075, "authorized udf function error", "授权UDF函数错误"),
CREATE_SCHEDULE_ERROR(10076, "create schedule error", "创建调度配置错误"),
UPDATE_SCHEDULE_ERROR(10077, "update schedule error", "更新调度配置错误"),
PUBLISH_SCHEDULE_ONLINE_ERROR(10078, "publish schedule online error", "上线调度配置错误"),
OFFLINE_SCHEDULE_ERROR(10079, "offline schedule error", "下线调度配置错误"),
QUERY_SCHEDULE_LIST_PAGING_ERROR(10080, "query schedule list paging error", "分页查询调度配置列表错误"),
QUERY_SCHEDULE_LIST_ERROR(10081, "query schedule list error", "查询调度配置列表错误"),
QUERY_TASK_LIST_PAGING_ERROR(10082, "query task list paging error", "分页查询任务列表错误"),
QUERY_TASK_RECORD_LIST_PAGING_ERROR(10083, "query task record list paging error", "分页查询任务记录错误"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | CREATE_TENANT_ERROR(10084, "create tenant error", "创建租户错误"),
QUERY_TENANT_LIST_PAGING_ERROR(10085, "query tenant list paging error", "分页查询租户列表错误"),
QUERY_TENANT_LIST_ERROR(10086, "query tenant list error", "查询租户列表错误"),
UPDATE_TENANT_ERROR(10087, "update tenant error", "更新租户错误"),
DELETE_TENANT_BY_ID_ERROR(10088, "delete tenant by id error", "删除租户错误"),
VERIFY_OS_TENANT_CODE_ERROR(10089, "verify os tenant code error", "操作系统租户验证错误"),
CREATE_USER_ERROR(10090, "create user error", "创建用户错误"),
QUERY_USER_LIST_PAGING_ERROR(10091, "query user list paging error", "分页查询用户列表错误"),
UPDATE_USER_ERROR(10092, "update user error", "更新用户错误"),
DELETE_USER_BY_ID_ERROR(10093, "delete user by id error", "删除用户错误"),
GRANT_PROJECT_ERROR(10094, "grant project error", "授权项目错误"),
GRANT_RESOURCE_ERROR(10095, "grant resource error", "授权资源错误"),
GRANT_UDF_FUNCTION_ERROR(10096, "grant udf function error", "授权UDF函数错误"),
GRANT_DATASOURCE_ERROR(10097, "grant datasource error", "授权数据源错误"),
GET_USER_INFO_ERROR(10098, "get user info error", "获取用户信息错误"),
USER_LIST_ERROR(10099, "user list error", "查询用户列表错误"),
VERIFY_USERNAME_ERROR(10100, "verify username error", "用户名验证错误"),
UNAUTHORIZED_USER_ERROR(10101, "unauthorized user error", "查询未授权用户错误"),
AUTHORIZED_USER_ERROR(10102, "authorized user error", "查询授权用户错误"),
QUERY_TASK_INSTANCE_LOG_ERROR(10103, "view task instance log error", "查询任务实例日志错误"),
DOWNLOAD_TASK_INSTANCE_LOG_FILE_ERROR(10104, "download task instance log file error", "下载任务日志文件错误"),
CREATE_PROCESS_DEFINITION_ERROR(10105, "create process definition error", "创建工作流错误"),
VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR(10106, "verify process definition name unique error", "工作流定义名称验证错误"),
UPDATE_PROCESS_DEFINITION_ERROR(10107, "update process definition error", "更新工作流定义错误"),
RELEASE_PROCESS_DEFINITION_ERROR(10108, "release process definition error", "上线工作流错误"),
QUERY_DETAIL_OF_PROCESS_DEFINITION_ERROR(10109, "query detail of process definition error", "查询工作流详细信息错误"),
QUERY_PROCESS_DEFINITION_LIST(10110, "query process definition list", "查询工作流列表错误"),
ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR(10111, "encapsulation treeview structure error", "查询工作流树形图数据错误"),
GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR(10112, "get tasks list by process definition id error", "查询工作流定义节点信息错误"),
QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR(10113, "query process instance list paging error", "分页查询工作流实例列表错误"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR(10114, "query task list by process instance id error", "查询任务实例列表错误"),
UPDATE_PROCESS_INSTANCE_ERROR(10115, "update process instance error", "更新工作流实例错误"),
QUERY_PROCESS_INSTANCE_BY_ID_ERROR(10116, "query process instance by id error", "查询工作流实例错误"),
DELETE_PROCESS_INSTANCE_BY_ID_ERROR(10117, "delete process instance by id error", "删除工作流实例错误"),
QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR(10118, "query sub process instance detail info by task id error", "查询子流程任务实例错误"),
QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR(10119, "query parent process instance detail info by sub process instance id error", "查询子流程该工作流实例错误"),
QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR(10120, "query process instance all variables error", "查询工作流自定义变量信息错误"),
ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR(10121, "encapsulation process instance gantt structure error", "查询工作流实例甘特图数据错误"),
QUERY_PROCESS_DEFINITION_LIST_PAGING_ERROR(10122, "query process definition list paging error", "分页查询工作流定义列表错误"),
SIGN_OUT_ERROR(10123, "sign out error", "退出错误"),
OS_TENANT_CODE_HAS_ALREADY_EXISTS(10124, "os tenant code has already exists", "操作系统租户已存在"),
IP_IS_EMPTY(10125, "ip is empty", "IP地址不能为空"),
SCHEDULE_CRON_REALEASE_NEED_NOT_CHANGE(10126, "schedule release is already {0}", "调度配置上线错误[{0}]"),
CREATE_QUEUE_ERROR(10127, "create queue error", "创建队列错误"),
QUEUE_NOT_EXIST(10128, "queue {0} not exists", "队列ID[{0}]不存在"),
QUEUE_VALUE_EXIST(10129, "queue value {0} already exists", "队列值[{0}]已存在"),
QUEUE_NAME_EXIST(10130, "queue name {0} already exists", "队列名称[{0}]已存在"),
UPDATE_QUEUE_ERROR(10131, "update queue error", "更新队列信息错误"),
NEED_NOT_UPDATE_QUEUE(10132, "no content changes, no updates are required", "数据未变更，不需要更新队列信息"),
VERIFY_QUEUE_ERROR(10133, "verify queue error", "验证队列信息错误"),
NAME_NULL(10134, "name must be not null", "名称不能为空"),
NAME_EXIST(10135, "name {0} already exists", "名称[{0}]已存在"),
SAVE_ERROR(10136, "save error", "保存错误"),
DELETE_PROJECT_ERROR_DEFINES_NOT_NULL(10137, "please delete the process definitions in project first!", "请先删除全部工作流定义"),
BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR(10117, "batch delete process instance by ids {0} error", "批量删除工作流实例错误: {0}"),
PREVIEW_SCHEDULE_ERROR(10139, "preview schedule error", "预览调度配置错误"),
PARSE_TO_CRON_EXPRESSION_ERROR(10140, "parse cron to cron expression error", "解析调度表达式错误"),
SCHEDULE_START_TIME_END_TIME_SAME(10141, "The start time must not be the same as the end", "开始时间不能和结束时间一样"),
DELETE_TENANT_BY_ID_FAIL(10142, "delete tenant by id fail, for there are {0} process instances in executing using it", "删除租户失败，有[{0}]个运行中的工作流实例正在使用"),
DELETE_TENANT_BY_ID_FAIL_DEFINES(10143, "delete tenant by id fail, for there are {0} process definitions using it", "删除租户失败，有[{0}]个工作流定义正在使用"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | DELETE_TENANT_BY_ID_FAIL_USERS(10144, "delete tenant by id fail, for there are {0} users using it", "删除租户失败，有[{0}]个用户正在使用"),
DELETE_WORKER_GROUP_BY_ID_FAIL(10145, "delete worker group by id fail, for there are {0} process instances in executing using it", "删除Worker分组失败，有[{0}]个运行中的工作流实例正在使用"),
QUERY_WORKER_GROUP_FAIL(10146, "query worker group fail ", "查询worker分组失败"),
DELETE_WORKER_GROUP_FAIL(10147, "delete worker group fail ", "删除worker分组失败"),
USER_DISABLED(10148, "The current user is disabled", "当前用户已停用"),
COPY_PROCESS_DEFINITION_ERROR(10149, "copy process definition from {0} to {1} error : {2}", "从{0}复制工作流到{1}错误 : {2}"),
MOVE_PROCESS_DEFINITION_ERROR(10150, "move process definition from {0} to {1} error : {2}", "从{0}移动工作流到{1}错误 : {2}"),
SWITCH_PROCESS_DEFINITION_VERSION_ERROR(10151, "Switch process definition version error", "切换工作流版本出错"),
SWITCH_PROCESS_DEFINITION_VERSION_NOT_EXIST_PROCESS_DEFINITION_ERROR(10152
, "Switch process definition version error: not exists process definition, [process definition id {0}]", "切换工作流版本出错：工作流不存在，[工作流id {0}]"),
SWITCH_PROCESS_DEFINITION_VERSION_NOT_EXIST_PROCESS_DEFINITION_VERSION_ERROR(10153
, "Switch process definition version error: not exists process definition version, [process definition id {0}] [version number {1}]", "切换工作流版本出错：工作流版本信息不存在，[工作流id {0}] [版本号 {1}]"),
QUERY_PROCESS_DEFINITION_VERSIONS_ERROR(10154, "query process definition versions error", "查询工作流历史版本信息出错"),
DELETE_PROCESS_DEFINITION_VERSION_ERROR(10156, "delete process definition version error", "删除工作流历史版本出错"),
QUERY_USER_CREATED_PROJECT_ERROR(10157, "query user created project error error", "查询用户创建的项目错误"),
PROCESS_DEFINITION_CODES_IS_EMPTY(10158, "process definition codes is empty", "工作流CODES不能为空"),
BATCH_COPY_PROCESS_DEFINITION_ERROR(10159, "batch copy process definition error", "复制工作流错误"),
BATCH_MOVE_PROCESS_DEFINITION_ERROR(10160, "batch move process definition error", "移动工作流错误"),
QUERY_WORKFLOW_LINEAGE_ERROR(10161, "query workflow lineage error", "查询血缘失败"),
QUERY_AUTHORIZED_AND_USER_CREATED_PROJECT_ERROR(10162, "query authorized and user created project error error", "查询授权的和用户创建的项目错误"),
DELETE_PROCESS_DEFINITION_BY_CODE_FAIL(10163, "delete process definition by code fail, for there are {0} process instances in executing using it", "删除工作流定义失败，有[{0}]个运行中的工作流实例正在使用"),
CHECK_OS_TENANT_CODE_ERROR(10164, "Please enter the English os tenant code", "请输入英文操作系统租户"),
FORCE_TASK_SUCCESS_ERROR(10165, "force task success error", "强制成功任务实例错误"),
TASK_INSTANCE_STATE_OPERATION_ERROR(10166, "the status of task instance {0} is {1},Cannot perform force success operation", "任务实例[{0}]的状态是[{1}]，无法执行强制成功操作"),
DATASOURCE_TYPE_NOT_EXIST(10167, "data source type not exist", "数据源类型不存在"),
PROCESS_DEFINITION_NAME_EXIST(10168, "process definition name {0} already exists", "工作流定义名称[{0}]已存在"),
DATASOURCE_DB_TYPE_ILLEGAL(10169, "datasource type illegal", "数据源类型参数不合法"),
DATASOURCE_PORT_ILLEGAL(10170, "datasource port illegal", "数据源端口参数不合法"),
DATASOURCE_OTHER_PARAMS_ILLEGAL(10171, "datasource other params illegal", "数据源其他参数不合法"),
DATASOURCE_NAME_ILLEGAL(10172, "datasource name illegal", "数据源名称不合法"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | DATASOURCE_HOST_ILLEGAL(10173, "datasource host illegal", "数据源HOST不合法"),
DELETE_WORKER_GROUP_NOT_EXIST(10174, "delete worker group not exist ", "删除worker分组不存在"),
CREATE_WORKER_GROUP_FORBIDDEN_IN_DOCKER(10175, "create worker group forbidden in docker ", "创建worker分组在docker中禁止"),
DELETE_WORKER_GROUP_FORBIDDEN_IN_DOCKER(10176, "delete worker group forbidden in docker ", "删除worker分组在docker中禁止"),
WORKER_ADDRESS_INVALID(10177, "worker address {0} invalid", "worker地址[{0}]无效"),
QUERY_WORKER_ADDRESS_LIST_FAIL(10178, "query worker address list fail ", "查询worker地址列表失败"),
TRANSFORM_PROJECT_OWNERSHIP(10179, "Please transform project ownership [{0}]", "请先转移项目所有权[{0}]"),
QUERY_ALERT_GROUP_ERROR(10180, "query alert group error", "查询告警组错误"),
CURRENT_LOGIN_USER_TENANT_NOT_EXIST(10181, "the tenant of the currently login user is not specified", "未指定当前登录用户的租户"),
REVOKE_PROJECT_ERROR(10182, "revoke project error", "撤销项目授权错误"),
QUERY_AUTHORIZED_USER(10183, "query authorized user error", "查询拥有项目权限的用户错误"),
PROJECT_NOT_EXIST(10190, "This project was not found. Please refresh page.", "该项目不存在,请刷新页面"),
UDF_FUNCTION_NOT_EXIST(20001, "UDF function not found", "UDF函数不存在"),
UDF_FUNCTION_EXISTS(20002, "UDF function already exists", "UDF函数已存在"),
RESOURCE_NOT_EXIST(20004, "resource not exist", "资源不存在"),
RESOURCE_EXIST(20005, "resource already exists", "资源已存在"),
RESOURCE_SUFFIX_NOT_SUPPORT_VIEW(20006, "resource suffix do not support online viewing", "资源文件后缀不支持查看"),
RESOURCE_SIZE_EXCEED_LIMIT(20007, "upload resource file size exceeds limit", "上传资源文件大小超过限制"),
RESOURCE_SUFFIX_FORBID_CHANGE(20008, "resource suffix not allowed to be modified", "资源文件后缀不支持修改"),
UDF_RESOURCE_SUFFIX_NOT_JAR(20009, "UDF resource suffix name must be jar", "UDF资源文件后缀名只支持[jar]"),
HDFS_COPY_FAIL(20010, "hdfs copy {0} -> {1} fail", "hdfs复制失败：[{0}] -> [{1}]"),
RESOURCE_FILE_EXIST(20011, "resource file {0} already exists in hdfs,please delete it or change name!", "资源文件[{0}]在hdfs中已存在，请删除或修改资源名"),
RESOURCE_FILE_NOT_EXIST(20012, "resource file {0} not exists !", "资源文件[{0}]不存在"),
UDF_RESOURCE_IS_BOUND(20013, "udf resource file is bound by UDF functions:{0}", "udf函数绑定了资源文件[{0}]"),
RESOURCE_IS_USED(20014, "resource file is used by process definition", "资源文件被上线的流程定义使用了"),
PARENT_RESOURCE_NOT_EXIST(20015, "parent resource not exist", "父资源文件不存在"),
RESOURCE_NOT_EXIST_OR_NO_PERMISSION(20016, "resource not exist or no permission,please view the task node and remove error resource", "请检查任务节点并移除无权限或者已删除的资源"),
RESOURCE_IS_AUTHORIZED(20017, "resource is authorized to user {0},suffix not allowed to be modified", "资源文件已授权其他用户[{0}],后缀不允许修改"),
USER_NO_OPERATION_PERM(30001, "user has no operation privilege", "当前用户没有操作权限"),
USER_NO_OPERATION_PROJECT_PERM(30002, "user {0} is not has project {1} permission", "当前用户[{0}]没有[{1}]项目的操作权限"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | PROCESS_INSTANCE_NOT_EXIST(50001, "process instance {0} does not exist", "工作流实例[{0}]不存在"),
PROCESS_INSTANCE_EXIST(50002, "process instance {0} already exists", "工作流实例[{0}]已存在"),
PROCESS_DEFINE_NOT_EXIST(50003, "process definition {0} does not exist", "工作流定义[{0}]不存在"),
PROCESS_DEFINE_NOT_RELEASE(50004, "process definition {0} not on line", "工作流定义[{0}]不是上线状态"),
PROCESS_INSTANCE_ALREADY_CHANGED(50005, "the status of process instance {0} is already {1}", "工作流实例[{0}]的状态已经是[{1}]"),
PROCESS_INSTANCE_STATE_OPERATION_ERROR(50006, "the status of process instance {0} is {1},Cannot perform {2} operation", "工作流实例[{0}]的状态是[{1}]，无法执行[{2}]操作"),
SUB_PROCESS_INSTANCE_NOT_EXIST(50007, "the task belong to process instance does not exist", "子工作流实例不存在"),
PROCESS_DEFINE_LLOWED_EDIT(50008, "process definition {0} does not allow edit", "工作流定义[{0}]不允许修改"),
PROCESS_INSTANCE_EXECUTING_COMMAND(50009, "process instance {0} is executing the command, please wait ...", "工作流实例[{0}]正在执行命令，请稍等..."),
PROCESS_INSTANCE_NOT_SUB_PROCESS_INSTANCE(50010, "process instance {0} is not sub process instance", "工作流实例[{0}]不是子工作流实例"),
TASK_INSTANCE_STATE_COUNT_ERROR(50011, "task instance state count error", "查询各状态任务实例数错误"),
COUNT_PROCESS_INSTANCE_STATE_ERROR(50012, "count process instance state error", "查询各状态流程实例数错误"),
COUNT_PROCESS_DEFINITION_USER_ERROR(50013, "count process definition user error", "查询各用户流程定义数错误"),
START_PROCESS_INSTANCE_ERROR(50014, "start process instance error", "运行工作流实例错误"),
BATCH_START_PROCESS_INSTANCE_ERROR(50014, "batch start process instance error: {0}", "批量运行工作流实例错误: {0}"),
EXECUTE_PROCESS_INSTANCE_ERROR(50015, "execute process instance error", "操作工作流实例错误"),
CHECK_PROCESS_DEFINITION_ERROR(50016, "check process definition error", "工作流定义错误"),
QUERY_RECIPIENTS_AND_COPYERS_BY_PROCESS_DEFINITION_ERROR(50017, "query recipients and copyers by process definition error", "查询收件人和抄送人错误"),
DATA_IS_NOT_VALID(50017, "data {0} not valid", "数据[{0}]无效"),
DATA_IS_NULL(50018, "data {0} is null", "数据[{0}]不能为空"),
PROCESS_NODE_HAS_CYCLE(50019, "process node has cycle", "流程节点间存在循环依赖"),
PROCESS_NODE_S_PARAMETER_INVALID(50020, "process node {0} parameter invalid", "流程节点[{0}]参数无效"),
PROCESS_DEFINE_STATE_ONLINE(50021, "process definition [{0}] is already on line", "工作流定义[{0}]已上线"),
DELETE_PROCESS_DEFINE_BY_CODE_ERROR(50022, "delete process definition by code error", "删除工作流定义错误"),
SCHEDULE_CRON_STATE_ONLINE(50023, "the status of schedule {0} is already on line", "调度配置[{0}]已上线"),
DELETE_SCHEDULE_CRON_BY_ID_ERROR(50024, "delete schedule by id error", "删除调度配置错误"),
BATCH_DELETE_PROCESS_DEFINE_ERROR(50025, "batch delete process definition error", "批量删除工作流定义错误"),
BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR(50026, "batch delete process definition by codes {0} error", "批量删除工作流定义[{0}]错误"),
TENANT_NOT_SUITABLE(50027, "there is not any tenant suitable, please choose a tenant available.", "没有合适的租户，请选择可用的租户"),
EXPORT_PROCESS_DEFINE_BY_ID_ERROR(50028, "export process definition by id error", "导出工作流定义错误"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | BATCH_EXPORT_PROCESS_DEFINE_BY_IDS_ERROR(50028, "batch export process definition by ids error", "批量导出工作流定义错误"),
IMPORT_PROCESS_DEFINE_ERROR(50029, "import process definition error", "导入工作流定义错误"),
TASK_DEFINE_NOT_EXIST(50030, "task definition [{0}] does not exist", "任务定义[{0}]不存在"),
CREATE_PROCESS_TASK_RELATION_ERROR(50032, "create process task relation error", "创建工作流任务关系错误"),
PROCESS_TASK_RELATION_NOT_EXIST(50033, "process task relation [{0}] does not exist", "工作流任务关系[{0}]不存在"),
PROCESS_TASK_RELATION_EXIST(50034, "process task relation is already exist, processCode:[{0}]", "工作流任务关系已存在, processCode:[{0}]"),
PROCESS_DAG_IS_EMPTY(50035, "process dag is empty", "工作流dag是空"),
CHECK_PROCESS_TASK_RELATION_ERROR(50036, "check process task relation error", "工作流任务关系参数错误"),
CREATE_TASK_DEFINITION_ERROR(50037, "create task definition error", "创建任务错误"),
UPDATE_TASK_DEFINITION_ERROR(50038, "update task definition error", "更新任务定义错误"),
QUERY_TASK_DEFINITION_VERSIONS_ERROR(50039, "query task definition versions error", "查询任务历史版本信息出错"),
SWITCH_TASK_DEFINITION_VERSION_ERROR(50040, "Switch task definition version error", "切换任务版本出错"),
DELETE_TASK_DEFINITION_VERSION_ERROR(50041, "delete task definition version error", "删除任务历史版本出错"),
DELETE_TASK_DEFINE_BY_CODE_ERROR(50042, "delete task definition by code error", "删除任务定义错误"),
QUERY_DETAIL_OF_TASK_DEFINITION_ERROR(50043, "query detail of task definition error", "查询任务详细信息错误"),
QUERY_TASK_DEFINITION_LIST_PAGING_ERROR(50044, "query task definition list paging error", "分页查询任务定义列表错误"),
TASK_DEFINITION_NAME_EXISTED(50045, "task definition name [{0}] already exists", "任务定义名称[{0}]已经存在"),
RELEASE_TASK_DEFINITION_ERROR(50046, "release task definition error", "上线任务错误"),
MOVE_PROCESS_TASK_RELATION_ERROR(50047, "move process task relation error", "移动任务到其他工作流错误"),
DELETE_TASK_PROCESS_RELATION_ERROR(50048, "delete process task relation error", "删除工作流任务关系错误"),
QUERY_TASK_PROCESS_RELATION_ERROR(50049, "query process task relation error", "查询工作流任务关系错误"),
TASK_DEFINE_STATE_ONLINE(50050, "task definition [{0}] is already on line", "任务定义[{0}]已上线"),
TASK_HAS_DOWNSTREAM(50051, "Task exists downstream [{0}] dependence", "任务存在下游[{0}]依赖"),
TASK_HAS_UPSTREAM(50052, "Task [{0}] exists upstream dependence", "任务[{0}]存在上游依赖"),
MAIN_TABLE_USING_VERSION(50053, "the version that the master table is using", "主表正在使用该版本"),
PROJECT_PROCESS_NOT_MATCH(50054, "the project and the process is not match", "项目和工作流不匹配"),
DELETE_EDGE_ERROR(50055, "delete edge error", "删除工作流任务连接线错误"),
NOT_SUPPORT_UPDATE_TASK_DEFINITION(50056, "task state does not support modification", "当前任务不支持修改"),
NOT_SUPPORT_COPY_TASK_TYPE(50057, "task type [{0}] does not support copy", "不支持复制的任务类型[{0}]"),
HDFS_NOT_STARTUP(60001, "hdfs not startup", "hdfs未启用"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | STORAGE_NOT_STARTUP(60002, "storage not startup", "存储未启用"),
S3_CANNOT_RENAME(60003, "directory cannot be renamed", "S3无法重命名文件夹"),
/**
* for monitor
*/
QUERY_DATABASE_STATE_ERROR(70001, "query database state error", "查询数据库状态错误"),
CREATE_ACCESS_TOKEN_ERROR(70010, "create access token error", "创建访问token错误"),
GENERATE_TOKEN_ERROR(70011, "generate token error", "生成token错误"),
QUERY_ACCESSTOKEN_LIST_PAGING_ERROR(70012, "query access token list paging error", "分页查询访问token列表错误"),
UPDATE_ACCESS_TOKEN_ERROR(70013, "update access token error", "更新访问token错误"),
DELETE_ACCESS_TOKEN_ERROR(70014, "delete access token error", "删除访问token错误"),
ACCESS_TOKEN_NOT_EXIST(70015, "access token not exist", "访问token不存在"),
QUERY_ACCESSTOKEN_BY_USER_ERROR(70016, "query access token by user error", "查询访问指定用户的token错误"),
COMMAND_STATE_COUNT_ERROR(80001, "task instance state count error", "查询各状态任务实例数错误"),
NEGTIVE_SIZE_NUMBER_ERROR(80002, "query size number error", "查询size错误"),
START_TIME_BIGGER_THAN_END_TIME_ERROR(80003, "start time bigger than end time error", "开始时间在结束时间之后错误"),
QUEUE_COUNT_ERROR(90001, "queue count error", "查询队列数据错误"),
KERBEROS_STARTUP_STATE(100001, "get kerberos startup state error", "获取kerberos启动状态错误"),
// audit log
QUERY_AUDIT_LOG_LIST_PAGING(10057, "query resources list paging", "分页查询资源列表错误"),
//plugin
PLUGIN__UI_COMPONENT(110001, "query plugin error, this plugin has no UI component", "查询插件错误，此插件无UI组件"),
QUERY_PLUGINS_RESULT_IS_NULL(110002, "query plugins result is null", "查询插件为空"),
QUERY_PLUGINS_ERROR(110003, "query plugins error", "查询插件错误"),
QUERY_PLUGIN_DETAIL_RESULT_IS_NULL(110004, "query plugin detail result is null", "查询插件详情结果为空"),
UPDATE_ALERT_PLUGIN_INSTANCE_ERROR(110005, "update alert plugin instance error", "更新告警组和告警组插件实例错误"),
DELETE_ALERT_PLUGIN_INSTANCE_ERROR(110006, "delete alert plugin instance error", "删除告警组和告警组插件实例错误"),
GET_ALERT_PLUGIN_INSTANCE_ERROR(110007, "get alert plugin instance error", "获取告警组和告警组插件实例错误"),
CREATE_ALERT_PLUGIN_INSTANCE_ERROR(110008, "create alert plugin instance error", "创建告警组和告警组插件实例错误"),
QUERY_ALL_ALERT_PLUGIN_INSTANCE_ERROR(110009, "query all alert plugin instance error", "查询所有告警实例失败"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | PLUGIN_INSTANCE_ALREADY_EXIT(110010, "plugin instance already exit", "该告警插件实例已存在"),
LIST_PAGING_ALERT_PLUGIN_INSTANCE_ERROR(110011, "query plugin instance page error", "分页查询告警实例失败"),
DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED(110012, "failed to delete the alert instance, there is an alarm group associated with this alert instance",
"删除告警实例失败，存在与此告警实例关联的警报组"),
PROCESS_DEFINITION_VERSION_IS_USED(110013,"this process definition version is used","此工作流定义版本被使用"),
CREATE_ENVIRONMENT_ERROR(120001, "create environment error", "创建环境失败"),
ENVIRONMENT_NAME_EXISTS(120002,"this environment name [{0}] already exists","环境名称[{0}]已经存在"),
ENVIRONMENT_NAME_IS_NULL(120003,"this environment name shouldn't be empty.","环境名称不能为空"),
ENVIRONMENT_CONFIG_IS_NULL(120004,"this environment config shouldn't be empty.","环境配置信息不能为空"),
UPDATE_ENVIRONMENT_ERROR(120005, "update environment [{0}] info error", "更新环境[{0}]信息失败"),
DELETE_ENVIRONMENT_ERROR(120006, "delete environment error", "删除环境信息失败"),
DELETE_ENVIRONMENT_RELATED_TASK_EXISTS(120007, "this environment has been used in tasks,so you can't delete it.", "该环境已经被任务使用，所以不能删除该环境信息"),
QUERY_ENVIRONMENT_BY_NAME_ERROR(1200008, "not found environment [{0}] ", "查询环境名称[{0}]信息不存在"),
QUERY_ENVIRONMENT_BY_CODE_ERROR(1200009, "not found environment [{0}] ", "查询环境编码[{0}]不存在"),
QUERY_ENVIRONMENT_ERROR(1200010, "login user query environment error", "分页查询环境列表错误"),
VERIFY_ENVIRONMENT_ERROR(1200011, "verify environment error", "验证环境信息错误"),
GET_RULE_FORM_CREATE_JSON_ERROR(1200012, "get rule form create json error", "获取规则 FROM-CREATE-JSON 错误"),
QUERY_RULE_LIST_PAGING_ERROR(1200013, "query rule list paging error", "获取规则分页列表错误"),
QUERY_RULE_LIST_ERROR(1200014, "query rule list error", "获取规则列表错误"),
QUERY_RULE_INPUT_ENTRY_LIST_ERROR(1200015, "query rule list error", "获取规则列表错误"),
QUERY_EXECUTE_RESULT_LIST_PAGING_ERROR(1200016, "query execute result list paging error", "获取数据质量任务结果分页错误"),
GET_DATASOURCE_OPTIONS_ERROR(1200017, "get datasource options error", "获取数据源Options错误"),
GET_DATASOURCE_TABLES_ERROR(1200018, "get datasource tables error", "获取数据源表列表错误"),
GET_DATASOURCE_TABLE_COLUMNS_ERROR(1200019, "get datasource table columns error", "获取数据源表列名错误"),
TASK_GROUP_NAME_EXSIT(130001,"this task group name is repeated in a project","该任务组名称在一个项目中已经使用"),
TASK_GROUP_SIZE_ERROR(130002,"task group size error","任务组大小应该为大于1的整数"),
TASK_GROUP_STATUS_ERROR(130003,"task group status error","任务组已经被关闭"),
TASK_GROUP_FULL(130004,"task group is full","任务组已经满了"),
TASK_GROUP_USED_SIZE_ERROR(130005,"the used size number of task group is dirty","任务组使用的容量发生了变化"),
TASK_GROUP_QUEUE_RELEASE_ERROR(130006,"failed to release task group queue","任务组资源释放时出现了错误"), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | TASK_GROUP_QUEUE_AWAKE_ERROR(130007,"awake waiting task failed","任务组使唤醒等待任务时发生了错误"),
CREATE_TASK_GROUP_ERROR(130008,"create task group error","创建任务组错误"),
UPDATE_TASK_GROUP_ERROR(130009,"update task group list error","更新任务组错误"),
QUERY_TASK_GROUP_LIST_ERROR(130010,"query task group list error","查询任务组列表错误"),
CLOSE_TASK_GROUP_ERROR(130011,"close task group error","关闭任务组错误"),
START_TASK_GROUP_ERROR(130012,"start task group error","启动任务组错误"),
QUERY_TASK_GROUP_QUEUE_LIST_ERROR(130013,"query task group queue list error","查询任务组队列列表错误"),
TASK_GROUP_CACHE_START_FAILED(130014,"cache start failed","任务组相关的缓存启动失败"),
ENVIRONMENT_WORKER_GROUPS_IS_INVALID(130015, "environment worker groups is invalid format", "环境关联的工作组参数解析错误"),
UPDATE_ENVIRONMENT_WORKER_GROUP_RELATION_ERROR(130016,"You can't modify the worker group, because the worker group [{0}] and this environment [{1}] already be used in the task [{2}]",
"您不能修改工作组选项，因为该工作组 [{0}] 和 该环境 [{1}] 已经被用在任务 [{2}] 中"),
TASK_GROUP_QUEUE_ALREADY_START(130017, "task group queue already start", "节点已经获取任务组资源"),
TASK_GROUP_STATUS_CLOSED(130018,"The tas been closed.","任务组已经被关闭"),
TASK_GROUP_STATUS_OPENED(130019,"The tas been opened.","任务组已经被开启"),
LLOW_TO_DISABLE_OWN_ACCOUNT(130020, "Not allow to disable your own account", "不能停用自己的账号"),
LLOW_TO_DELETE_DEFAULT_ALARM_GROUP(130030, "Not allow to delete the default alarm group ", "不能删除默认告警组"),
TIME_ZONE_ILLEGAL(130031, "time zone [{0}] is illegal", "时区参数 [{0}] 不合法"),
QUERY_K8S_NAMESPACE_LIST_PAGING_ERROR(1300001, "login user query k8s namespace list paging error", "分页查询k8s名称空间列表错误"),
K8S_NAMESPACE_EXIST(1300002, "k8s namespace {0} already exists", "k8s命名空间[{0}]已存在"),
CREATE_K8S_NAMESPACE_ERROR(1300003, "create k8s namespace error", "创建k8s命名空间错误"),
UPDATE_K8S_NAMESPACE_ERROR(1300004, "update k8s namespace error", "更新k8s命名空间信息错误"),
K8S_NAMESPACE_NOT_EXIST(1300005, "k8s namespace {0} not exists", "命名空间ID[{0}]不存在"),
K8S_CLIENT_OPS_ERROR(1300006, "k8s error with exception {0}", "k8s操作报错[{0}]"),
VERIFY_K8S_NAMESPACE_ERROR(1300007, "verify k8s and namespace error", "验证k8s命名空间信息错误"),
DELETE_K8S_NAMESPACE_BY_ID_ERROR(1300008, "delete k8s namespace by id error", "删除命名空间错误"),
VERIFY_PARAMETER_NAME_FAILED(1300009, "The file name verify failed", "文件命名校验失败"),
STORE_OPERATE_CREATE_ERROR(1300010, "create the resource failed", "存储操作失败");
private final int code;
private final String enMsg;
private final String zhMsg; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java | Status(int code, String enMsg, String zhMsg) {
this.code = code;
this.enMsg = enMsg;
this.zhMsg = zhMsg;
}
public int getCode() {
return this.code;
}
public String getMsg() {
if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(LocaleContextHolder.getLocale().getLanguage())) {
return this.zhMsg;
} else {
return this.enMsg;
}
}
/**
* Retrieve Status enum entity by status code.
* @param code
* @return
*/
public static Optional<Status> findStatusBy(int code) {
for (Status status : Status.values()) {
if (code == status.getCode()) {
return Optional.of(status);
}
}
return Optional.empty();
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.api.service.impl;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.LoggerService;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.User; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.log.LogClientService;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.commons.lang.StringUtils;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Objects;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.common.primitives.Bytes;
/**
* logger service impl
*/
@Service
public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService {
private static final Logger logger = LoggerFactory.getLogger(LoggerServiceImpl.class);
private static final String LOG_HEAD_FORMAT = "[LOG-PATH]: %s, [HOST]: %s%s";
@Autowired
private ProcessService processService;
private LogClientService logClient;
@Autowired
ProjectMapper projectMapper;
@Autowired
ProjectService projectService; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | @Autowired
TaskDefinitionMapper taskDefinitionMapper;
@PostConstruct
public void init() {
if (Objects.isNull(this.logClient)) {
this.logClient = new LogClientService();
}
}
@PreDestroy
public void close() {
if (Objects.nonNull(this.logClient) && this.logClient.isRunning()) {
logClient.close();
}
}
/**
* view log
*
* @param taskInstId task instance id
* @param skipLineNum skip line number
* @param limit limit
* @return log string data
*/
@Override
@SuppressWarnings("unchecked")
public Result<String> queryLog(int taskInstId, int skipLineNum, int limit) {
TaskInstance taskInstance = processService.findTaskInstanceById(taskInstId);
if (taskInstance == null || StringUtils.isBlank(taskInstance.getHost())) {
return Result.error(Status.TASK_INSTANCE_NOT_FOUND);
}
Result<String> result = new Result<>(Status.SUCCESS.getCode(), Status.SUCCESS.getMsg()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | String log = queryLog(taskInstance,skipLineNum,limit);
result.setData(log);
return result;
}
/**
* get log size
*
* @param taskInstId task instance id
* @return log byte array
*/
@Override
public byte[] getLogBytes(int taskInstId) {
TaskInstance taskInstance = processService.findTaskInstanceById(taskInstId);
if (taskInstance == null || StringUtils.isBlank(taskInstance.getHost())) {
throw new ServiceException("task instance is null or host is null");
}
return getLogBytes(taskInstance);
}
/**
* query log
*
* @param loginUser login user
* @param projectCode project code
* @param taskInstId task instance id
* @param skipLineNum skip line number
* @param limit limit
* @return log string data
*/
@Override
@SuppressWarnings("unchecked") |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | public Map<String, Object> queryLog(User loginUser, long projectCode, int taskInstId, int skipLineNum, int limit) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
TaskInstance task = processService.findTaskInstanceById(taskInstId);
if (task == null || StringUtils.isBlank(task.getHost())) {
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND);
return result;
}
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(task.getTaskCode());
if (taskDefinition != null && projectCode != taskDefinition.getProjectCode()) {
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND, taskInstId);
return result;
}
String log = queryLog(task, skipLineNum, limit);
result.put(Constants.DATA_LIST, log);
return result;
}
/**
* get log bytes
*
* @param loginUser login user
* @param projectCode project code
* @param taskInstId task instance id
* @return log byte array
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | @Override
public byte[] getLogBytes(User loginUser, long projectCode, int taskInstId) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
throw new ServiceException("user has no permission");
}
TaskInstance task = processService.findTaskInstanceById(taskInstId);
if (task == null || StringUtils.isBlank(task.getHost())) {
throw new ServiceException("task instance is null or host is null");
}
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(task.getTaskCode());
if (taskDefinition != null && projectCode != taskDefinition.getProjectCode()) {
throw new ServiceException("task instance does not exist in project");
}
return getLogBytes(task);
}
/**
* query log
*
* @param taskInstance task instance
* @param skipLineNum skip line number
* @param limit limit
* @return log string data
*/
private String queryLog(TaskInstance taskInstance, int skipLineNum, int limit) {
Host host = Host.of(taskInstance.getHost());
logger.info("log host : {} , logPath : {} , port : {}", host.getIp(), taskInstance.getLogPath(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java | host.getPort());
StringBuilder log = new StringBuilder();
if (skipLineNum == 0) {
String head = String.format(LOG_HEAD_FORMAT,
taskInstance.getLogPath(),
host,
Constants.SYSTEM_LINE_SEPARATOR);
log.append(head);
}
log.append(logClient
.rollViewLog(host.getIp(), host.getPort(), taskInstance.getLogPath(), skipLineNum, limit));
return log.toString();
}
/**
* get log bytes
*
* @param taskInstance task instance
* @return log byte array
*/
private byte[] getLogBytes(TaskInstance taskInstance) {
Host host = Host.of(taskInstance.getHost());
byte[] head = String.format(LOG_HEAD_FORMAT,
taskInstance.getLogPath(),
host,
Constants.SYSTEM_LINE_SEPARATOR).getBytes(StandardCharsets.UTF_8);
return Bytes.concat(head,
logClient.getLogBytes(host.getIp(), host.getPort(), taskInstance.getLogPath()));
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.api.service;
import org.apache.dolphinscheduler.api.enums.Status; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | import org.apache.dolphinscheduler.api.service.impl.LoggerServiceImpl;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.service.process.ProcessService;
import java.text.MessageFormat;
import java.util.HashMap;
import java.util.Map;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* logger service test
*/
@RunWith(MockitoJUnitRunner.class) |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | @PrepareForTest({LoggerServiceImpl.class})
public class LoggerServiceTest {
private static final Logger logger = LoggerFactory.getLogger(LoggerServiceTest.class);
@InjectMocks
private LoggerServiceImpl loggerService;
@Mock
private ProcessService processService;
@Mock
private ProjectMapper projectMapper;
@Mock
private ProjectService projectService;
@Mock
private TaskDefinitionMapper taskDefinitionMapper;
@Before
public void init() {
this.loggerService.init();
}
@Test
public void testQueryDataSourceList() {
TaskInstance taskInstance = new TaskInstance();
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | Result result = loggerService.queryLog(2, 1, 1);
Assert.assertEquals(Status.TASK_INSTANCE_NOT_FOUND.getCode(), result.getCode().intValue());
try {
result = loggerService.queryLog(1, 1, 1);
} catch (RuntimeException e) {
Assert.assertTrue(true);
logger.error("testQueryDataSourceList error {}", e.getMessage());
}
Assert.assertEquals(Status.TASK_INSTANCE_NOT_FOUND.getCode(), result.getCode().intValue());
taskInstance.setHost("127.0.0.1:8080");
taskInstance.setLogPath("/temp/log");
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance);
result = loggerService.queryLog(1, 1, 1);
Assert.assertEquals(Status.SUCCESS.getCode(), result.getCode().intValue());
}
@Test
public void testGetLogBytes() {
TaskInstance taskInstance = new TaskInstance();
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance);
try {
loggerService.getLogBytes(2);
} catch (RuntimeException e) {
Assert.assertTrue(true);
logger.error("testGetLogBytes error: {}", "task instance is null");
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | try {
loggerService.getLogBytes(1);
} catch (RuntimeException e) {
Assert.assertTrue(true);
logger.error("testGetLogBytes error: {}", "task instance host is null");
}
taskInstance.setHost("127.0.0.1:8080");
taskInstance.setLogPath("/temp/log");
loggerService.getLogBytes(1);
}
@Test
public void testQueryLogInSpecifiedProject() {
long projectCode = 1L;
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Project project = getProject(projectCode);
User loginUser = new User();
loginUser.setId(-1);
loginUser.setUserType(UserType.GENERAL_USER);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS, projectCode);
TaskInstance taskInstance = new TaskInstance();
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance);
TaskDefinition taskDefinition = new TaskDefinition();
taskDefinition.setProjectCode(projectCode);
taskDefinition.setCode(1L);
taskInstance.setTaskCode(1L); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | taskInstance.setId(1);
taskInstance.setHost("127.0.0.1:8080");
taskInstance.setLogPath("/temp/log");
Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode)).thenReturn(result);
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance);
Mockito.when(taskDefinitionMapper.queryByCode(taskInstance.getTaskCode())).thenReturn(taskDefinition);
result = loggerService.queryLog(loginUser, projectCode, 1, 1, 1);
Assert.assertEquals(Status.SUCCESS.getCode(), ((Status) result.get(Constants.STATUS)).getCode());
}
@Test
public void testGetLogBytesInSpecifiedProject() {
long projectCode = 1L;
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(getProject(projectCode));
Project project = getProject(projectCode);
User loginUser = new User();
loginUser.setId(-1);
loginUser.setUserType(UserType.GENERAL_USER);
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS, projectCode);
TaskInstance taskInstance = new TaskInstance();
TaskDefinition taskDefinition = new TaskDefinition();
taskDefinition.setProjectCode(projectCode);
taskDefinition.setCode(1L);
taskInstance.setTaskCode(1L);
taskInstance.setId(1);
taskInstance.setHost("127.0.0.1:8080");
taskInstance.setLogPath("/temp/log");
Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode)).thenReturn(result);
Mockito.when(processService.findTaskInstanceById(1)).thenReturn(taskInstance); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 9,045 | [Bug-RD][UI Next][V1.0.0-Alpha] A new fault-tolerant test bug | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
Run the workflow to close worker and master, restart the workflow did not continue to execute
url：http://8.142.81.15:12345/dolphinscheduler/ui/projects/4915141548736/workflow/instances/9801?code=4915682115648
<img width="1919" alt="image" src="https://user-images.githubusercontent.com/76080484/159208421-134de269-94dc-4572-b5d8-4eea7a8c84d3.png">
### What you expected to happen
Restarting master and worker continues execution to completion and outputs logs correctly
### How to reproduce
1. Run one or more process instances and tasks
2. Hang the Master and then the Worker
3. Restart the Master and then the Worker
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/9045 | https://github.com/apache/dolphinscheduler/pull/9205 | d3251c9bcc5744905723df7fab11a676029e7d6e | 994de4c9027f02b713bc3b03daad965bc01a25e1 | 2022-03-21T05:17:07Z | java | 2022-03-28T03:36:56Z | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java | Mockito.when(taskDefinitionMapper.queryByCode(taskInstance.getTaskCode())).thenReturn(taskDefinition);
loggerService.getLogBytes(loginUser, projectCode, 1);
}
@After
public void close() {
this.loggerService.close();
}
/**
* get mock Project
*
* @param projectCode projectCode
* @return Project
*/
private Project getProject(long projectCode) {
Project project = new Project();
project.setCode(projectCode);
project.setId(1);
project.setName("test");
project.setUserId(1);
return project;
}
private void putMsg(Map<String, Object> result, Status status, Object... statusParams) {
result.put(Constants.STATUS, status);
if (statusParams != null && statusParams.length > 0) {
result.put(Constants.MSG, MessageFormat.format(status.getMsg(), statusParams));
} else {
result.put(Constants.MSG, status.getMsg());
}
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.plugin.datasource.api.client; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java | import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider;
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
import org.apache.dolphinscheduler.spi.datasource.DataSourceClient;
import org.apache.dolphinscheduler.spi.enums.DbType;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.concurrent.TimeUnit;
import javax.sql.DataSource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate;
import com.google.common.base.Stopwatch;
public class CommonDataSourceClient implements DataSourceClient {
private static final Logger logger = LoggerFactory.getLogger(CommonDataSourceClient.class);
public static final String COMMON_USER = "root";
public static final String COMMON_PASSWORD = "123456";
public static final String COMMON_VALIDATION_QUERY = "select 1";
protected final BaseConnectionParam baseConnectionParam;
protected DataSource dataSource;
protected JdbcTemplate jdbcTemplate;
public CommonDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
this.baseConnectionParam = baseConnectionParam;
preInit();
checkEnv(baseConnectionParam);
initClient(baseConnectionParam, dbType);
checkClient();
}
protected void preInit() {
logger.info("preInit in CommonDataSourceClient"); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java | }
protected void checkEnv(BaseConnectionParam baseConnectionParam) {
checkValidationQuery(baseConnectionParam);
checkUser(baseConnectionParam);
}
protected void initClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
this.dataSource = JDBCDataSourceProvider.createJdbcDataSource(baseConnectionParam, dbType);
this.jdbcTemplate = new JdbcTemplate(dataSource);
}
protected void checkUser(BaseConnectionParam baseConnectionParam) {
if (StringUtils.isBlank(baseConnectionParam.getUser())) {
setDefaultUsername(baseConnectionParam);
}
if (StringUtils.isBlank(baseConnectionParam.getPassword())) {
setDefaultPassword(baseConnectionParam);
}
}
protected void setDefaultUsername(BaseConnectionParam baseConnectionParam) {
baseConnectionParam.setUser(COMMON_USER);
}
protected void setDefaultPassword(BaseConnectionParam baseConnectionParam) {
baseConnectionParam.setPassword(COMMON_PASSWORD);
}
protected void checkValidationQuery(BaseConnectionParam baseConnectionParam) {
if (StringUtils.isBlank(baseConnectionParam.getValidationQuery())) {
setDefaultValidationQuery(baseConnectionParam);
}
}
protected void setDefaultValidationQuery(BaseConnectionParam baseConnectionParam) {
baseConnectionParam.setValidationQuery(COMMON_VALIDATION_QUERY); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java | }
@Override
public void checkClient() {
Stopwatch stopwatch = Stopwatch.createStarted();
try {
this.jdbcTemplate.execute(this.baseConnectionParam.getValidationQuery());
} catch (Exception e) {
throw new RuntimeException("JDBC connect failed", e);
} finally {
logger.info("Time to execute check jdbc client with sql {} for {} ms ", this.baseConnectionParam.getValidationQuery(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
}
}
@Override
public Connection getConnection() {
try {
return this.dataSource.getConnection();
} catch (SQLException e) {
logger.error("get druidDataSource Connection fail SQLException: {}", e.getMessage(), e);
return null;
}
}
@Override
public void close() {
logger.info("do close dataSource.");
this.dataSource = null;
this.jdbcTemplate = null;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.plugin.datasource.api.client;
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.mysql.MySQLConnectionParam;
import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider;
import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
import org.apache.dolphinscheduler.spi.enums.DbType;
import java.sql.Connection;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java | import org.mockito.Mock;
import org.mockito.Mockito;
import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
import org.powermock.modules.junit4.PowerMockRunner;
import org.springframework.jdbc.core.JdbcTemplate;
import com.zaxxer.hikari.HikariDataSource;
@RunWith(PowerMockRunner.class)
@SuppressStaticInitializationFor("org.apache.dolphinscheduler.plugin.datasource.api.client.CommonDataSourceClient")
@PrepareForTest(value = {HikariDataSource.class, CommonDataSourceClient.class, JDBCDataSourceProvider.class, JdbcTemplate.class, Connection.class})
public class CommonDataSourceClientTest {
@Mock
private CommonDataSourceClient commonDataSourceClient;
@Test
public void testPreInit() {
PowerMockito.doNothing().when(commonDataSourceClient).preInit();
commonDataSourceClient.preInit();
Mockito.verify(commonDataSourceClient).preInit();
}
@Test
public void testCheckEnv() {
BaseConnectionParam baseConnectionParam = new MySQLConnectionParam();
PowerMockito.doNothing().when(commonDataSourceClient).checkEnv(Mockito.any(BaseConnectionParam.class));
commonDataSourceClient.checkEnv(baseConnectionParam);
Mockito.verify(commonDataSourceClient).checkEnv(Mockito.any(BaseConnectionParam.class));
PowerMockito.doNothing().when(commonDataSourceClient).checkValidationQuery(Mockito.any(BaseConnectionParam.class));
commonDataSourceClient.checkValidationQuery(baseConnectionParam);
Mockito.verify(commonDataSourceClient).checkValidationQuery(Mockito.any(BaseConnectionParam.class));
PowerMockito.doNothing().when(commonDataSourceClient).checkUser(Mockito.any(BaseConnectionParam.class)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,281 | [Bug] [DataSource] mysql 8 jdbc connect failed | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
I was in dev model and using StandaloneServer
When I created a mysql 8 dataresourse, and clicked button "test connection" but dolphinscheduler-ui shows:
"JDBS connected failed"
### What you expected to happen
click "test connection" can return test result.
dolphinscheduler-api server should not keep outputting error logs.
### How to reproduce
In dev model and using StandaloneServer
create a datasource (mysql 8)
click the "test connect" button.
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8281 | https://github.com/apache/dolphinscheduler/pull/9199 | 052df581f58405c840d97711f75894a682028a3c | 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c | 2022-02-04T11:14:49Z | java | 2022-03-28T04:32:49Z | dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java | commonDataSourceClient.checkUser(baseConnectionParam);
Mockito.verify(commonDataSourceClient).checkUser(Mockito.any(BaseConnectionParam.class));
PowerMockito.doNothing().when(commonDataSourceClient).setDefaultUsername(Mockito.any(BaseConnectionParam.class));
commonDataSourceClient.setDefaultUsername(baseConnectionParam);
Mockito.verify(commonDataSourceClient).setDefaultUsername(Mockito.any(BaseConnectionParam.class));
PowerMockito.doNothing().when(commonDataSourceClient).setDefaultPassword(Mockito.any(BaseConnectionParam.class));
commonDataSourceClient.setDefaultPassword(baseConnectionParam);
Mockito.verify(commonDataSourceClient).setDefaultPassword(Mockito.any(BaseConnectionParam.class));
}
@Test
public void testInitClient() {
BaseConnectionParam baseConnectionParam = new MySQLConnectionParam();
PowerMockito.doNothing().when(commonDataSourceClient).initClient(Mockito.any(BaseConnectionParam.class), Mockito.any());
commonDataSourceClient.initClient(baseConnectionParam, DbType.MYSQL);
Mockito.verify(commonDataSourceClient).initClient(Mockito.any(BaseConnectionParam.class), Mockito.any());
}
@Test
public void testCheckClient() {
PowerMockito.doNothing().when(this.commonDataSourceClient).checkClient();
this.commonDataSourceClient.checkClient();
Mockito.verify(this.commonDataSourceClient).checkClient();
}
@Test
public void testGetConnection() {
Connection connection = PowerMockito.mock(Connection.class);
PowerMockito.when(commonDataSourceClient.getConnection()).thenReturn(connection);
Assert.assertNotNull(commonDataSourceClient.getConnection());
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http:www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.dolphinscheduler.e2e.cases;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import org.apache.dolphinscheduler.e2e.core.Constants;
import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
import org.apache.dolphinscheduler.e2e.pages.LoginPage;
import org.apache.dolphinscheduler.e2e.pages.resource.FileManagePage;
import org.apache.dolphinscheduler.e2e.pages.resource.ResourcePage;
import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | import org.apache.dolphinscheduler.e2e.pages.security.TenantPage;
import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
import java.io.File;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Comparator;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import lombok.SneakyThrows;
@DolphinScheduler(composeFiles = "docker/file-manage/docker-compose.yaml")
public class FileManageE2ETest {
private static RemoteWebDriver browser;
private static final String tenant = System.getProperty("user.name");
private static final String user = "admin";
private static final String password = "dolphinscheduler123";
private static final String email = "[email protected]";
private static final String phone = "15800000000";
private static final String testDirectoryName = "test_directory";
private static final String testSubDirectoryName = "test_sub_directory";
private static final String testRenameDirectoryName = "test_rename_directory"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | private static final String testFileName = "test_file";
private static final String testRenameFileName = "test_rename_file.sh";
private static final String testUnder1GBFileName = "test_file_0.01G";
private static final Path testOver1GBFilePath = Constants.HOST_TMP_PATH.resolve("test_file_1.5G");
private static final Path testUnder1GBFilePath = Constants.HOST_TMP_PATH.resolve(testUnder1GBFileName);
@BeforeAll
public static void setup() {
TenantPage tenantPage = new LoginPage(browser)
.login(user, password)
.goToNav(SecurityPage.class)
.goToTab(TenantPage.class)
.create(tenant);
await().untilAsserted(() -> assertThat(tenantPage.tenantList())
.as("Tenant list should contain newly-created tenant")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(tenant)));
UserPage userPage = tenantPage.goToNav(SecurityPage.class)
.goToTab(UserPage.class);
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
userPage.update(user, user, password, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(FileManagePage.class);
}
@AfterAll
@SneakyThrows
public static void cleanup() {
Files.deleteIfExists(testUnder1GBFilePath);
Files.deleteIfExists(testOver1GBFilePath);
Files.walk(Constants.HOST_CHROME_DOWNLOAD_PATH) |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | .sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
}
@Test
@Order(10)
void testCreateDirectory() {
final FileManagePage page = new FileManagePage(browser);
page.createDirectory(testDirectoryName, "test_desc");
await().untilAsserted(() -> assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testDirectoryName)));
}
@Test
@Order(11)
void testCancelCreateDirectory() {
final FileManagePage page = new FileManagePage(browser);
page.cancelCreateDirectory(testDirectoryName, "test_desc");
await().untilAsserted(() -> assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testDirectoryName)));
}
/*
* when the storage is s3,the directory cannot be renamed
* */
@Test
@Order(30)
void testDeleteDirectory() { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | final FileManagePage page = new FileManagePage(browser);
page.goToNav(ResourcePage.class)
.goToTab(FileManagePage.class)
.delete(testDirectoryName);
await().untilAsserted(() -> {
browser.navigate().refresh();
assertThat(
page.fileList()
).noneMatch(
it -> it.getText().contains(testDirectoryName)
);
});
}
@Test
@Order(40)
void testCreateFile() {
final FileManagePage page = new FileManagePage(browser);
String scripts = "echo 123";
page.createFile(testFileName, scripts);
await().untilAsserted(() -> assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testFileName)));
}
@Test
@Order(41)
void testRenameFile() {
final FileManagePage page = new FileManagePage(browser);
page.rename(testFileName, testRenameFileName);
await().untilAsserted(() -> { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | browser.navigate().refresh();
assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testRenameFileName));
});
}
@Test
@Order(42)
void testEditFile() {
final FileManagePage page = new FileManagePage(browser);
String scripts = "echo 456";
page.editFile(testRenameFileName, scripts);
await().untilAsserted(() -> assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testRenameFileName)));
}
@Test
@Order(45)
void testDeleteFile() {
final FileManagePage page = new FileManagePage(browser);
page.delete(testRenameFileName);
await().untilAsserted(() -> {
browser.navigate().refresh();
assertThat(
page.fileList()
).noneMatch(
it -> it.getText().contains(testRenameFileName)
); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FileManageE2ETest.java | });
}
@Test
@Order(65)
void testUploadUnder1GBFile() throws IOException {
FileManagePage page = new FileManagePage(browser);
browser.navigate().refresh();
RandomAccessFile file = new RandomAccessFile(testUnder1GBFilePath.toFile(), "rw");
file.setLength((long) (0.01 * 1024 * 1024 * 1024));
page.uploadFile(testUnder1GBFilePath.toFile().getAbsolutePath());
new WebDriverWait(browser, 10).until(ExpectedConditions.invisibilityOfElementLocated(By.id("fileUpdateDialog")));
await().untilAsserted(() -> {
assertThat(page.fileList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testUnder1GBFileName));
});
}
@Test
@Order(70)
void testDownloadFile() {
final FileManagePage page = new FileManagePage(browser);
page.downloadFile(testUnder1GBFileName);
File file = Constants.HOST_CHROME_DOWNLOAD_PATH.resolve(testUnder1GBFileName).toFile();
await().untilAsserted(() -> {
assert file.exists();
});
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.dolphinscheduler.e2e.cases;
import lombok.SneakyThrows;
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;
import org.apache.dolphinscheduler.e2e.core.Constants;
import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
import org.apache.dolphinscheduler.e2e.pages.LoginPage;
import org.apache.dolphinscheduler.e2e.pages.resource.FunctionManagePage; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java | import org.apache.dolphinscheduler.e2e.pages.resource.ResourcePage;
import org.apache.dolphinscheduler.e2e.pages.resource.UdfManagePage;
import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage;
import org.apache.dolphinscheduler.e2e.pages.security.TenantPage;
import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.Path;
import java.time.Duration;
import java.util.Comparator;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
@DolphinScheduler(composeFiles = "docker/file-manage/docker-compose.yaml")
public class FunctionManageE2ETest {
private static RemoteWebDriver browser;
private static final String tenant = System.getProperty("user.name");
private static final String user = "admin";
private static final String password = "dolphinscheduler123";
private static final String email = "[email protected]"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java | private static final String phone = "15800000000";
private static final String testUdfFunctionName = "test_function";
private static final String testRenameUdfFunctionName = "test_rename_function";
private static final String testUploadUdfFileName = "hive-jdbc-3.1.2.jar";
private static final String testClassName = "org.dolphinscheduler.UdfTest";
private static final String testDescription = "test_description";
private static final Path testUploadUdfFilePath = Constants.HOST_TMP_PATH.resolve(testUploadUdfFileName);
@BeforeAll
@SneakyThrows
public static void setup() {
TenantPage tenantPage = new LoginPage(browser)
.login(user, password)
.goToNav(SecurityPage.class)
.goToTab(TenantPage.class)
.create(tenant);
await().untilAsserted(() -> assertThat(tenantPage.tenantList())
.as("Tenant list should contain newly-created tenant")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(tenant)));
downloadFile("https://repo1.maven.org/maven2/org/apache/hive/hive-jdbc/3.1.2/hive-jdbc-3.1.2.jar", testUploadUdfFilePath.toFile().getAbsolutePath());
UserPage userPage = tenantPage.goToNav(SecurityPage.class)
.goToTab(UserPage.class);
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
UdfManagePage udfManagePage = userPage.update(user, user, password, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(UdfManagePage.class)
.uploadFile(testUploadUdfFilePath.toFile().getAbsolutePath());
udfManagePage.goToNav(ResourcePage.class)
.goToTab(FunctionManagePage.class); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java | }
@AfterAll
@SneakyThrows
public static void cleanup() {
Files.walk(Constants.HOST_CHROME_DOWNLOAD_PATH)
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
Files.deleteIfExists(testUploadUdfFilePath);
}
static void downloadFile(String downloadUrl, String filePath) throws Exception {
int byteRead;
URL url = new URL(downloadUrl);
URLConnection conn = url.openConnection();
InputStream inStream = conn.getInputStream();
FileOutputStream fs = new FileOutputStream(filePath);
byte[] buffer = new byte[1024];
while ((byteRead = inStream.read(buffer)) != -1) {
fs.write(buffer, 0, byteRead);
}
inStream.close();
fs.close();
}
@Test
@Order(10)
void testCreateUdfFunction() {
FunctionManagePage page = new FunctionManagePage(browser);
page.createUdfFunction(testUdfFunctionName, testClassName, testUploadUdfFileName, testDescription);
await().untilAsserted(() -> assertThat(page.functionList())
.as("Function list should contain newly-created file") |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/FunctionManageE2ETest.java | .extracting(WebElement::getText)
.anyMatch(it -> it.contains(testUdfFunctionName)));
}
@Test
@Order(20)
void testRenameUdfFunction() {
FunctionManagePage page = new FunctionManagePage(browser);
browser.navigate().refresh();
page.renameUdfFunction(testUdfFunctionName, testRenameUdfFunctionName);
await().pollDelay(Duration.ofSeconds(2)).untilAsserted(() -> assertThat(page.functionList())
.as("Function list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testRenameUdfFunctionName)));
}
@Test
@Order(30)
void testDeleteUdfFunction() {
FunctionManagePage page = new FunctionManagePage(browser);
page.deleteUdfFunction(testRenameUdfFunctionName);
await().untilAsserted(() -> {
browser.navigate().refresh();
assertThat(
page.functionList()
).noneMatch(
it -> it.getText().contains(testRenameUdfFunctionName)
);
});
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java | /*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http:www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*
*/
package org.apache.dolphinscheduler.e2e.cases;
import lombok.SneakyThrows;
import static org.assertj.core.api.Assertions.assertThat; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java | import static org.awaitility.Awaitility.await;
import org.apache.dolphinscheduler.e2e.core.Constants;
import org.apache.dolphinscheduler.e2e.core.DolphinScheduler;
import org.apache.dolphinscheduler.e2e.pages.LoginPage;
import org.apache.dolphinscheduler.e2e.pages.resource.ResourcePage;
import org.apache.dolphinscheduler.e2e.pages.resource.UdfManagePage;
import org.apache.dolphinscheduler.e2e.pages.security.SecurityPage;
import org.apache.dolphinscheduler.e2e.pages.security.TenantPage;
import org.apache.dolphinscheduler.e2e.pages.security.UserPage;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
import org.openqa.selenium.By;
import org.openqa.selenium.WebElement;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.net.URL;
import java.net.URLConnection;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Comparator;
import java.util.Objects;
@DolphinScheduler(composeFiles = "docker/file-manage/docker-compose.yaml")
public class UdfManageE2ETest { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java | private static RemoteWebDriver browser;
private static final String tenant = System.getProperty("user.name");
private static final String user = "admin";
private static final String password = "dolphinscheduler123";
private static final String email = "[email protected]";
private static final String phone = "15800000000";
private static final String testDirectoryName = "test_directory";
private static final String testRenameDirectoryName = "test_rename_directory";
private static final String testUploadUdfFileName = "hive-jdbc-3.1.2.jar";
private static final Path testUploadUdfFilePath = Constants.HOST_TMP_PATH.resolve(testUploadUdfFileName);
private static final String testUploadUdfRenameFileName = "hive-jdbc.jar";
@BeforeAll
public static void setup() {
TenantPage tenantPage = new LoginPage(browser)
.login(user, password)
.goToNav(SecurityPage.class)
.goToTab(TenantPage.class)
.create(tenant);
await().untilAsserted(() -> assertThat(tenantPage.tenantList())
.as("Tenant list should contain newly-created tenant")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(tenant)));
UserPage userPage = tenantPage.goToNav(SecurityPage.class)
.goToTab(UserPage.class);
new WebDriverWait(userPage.driver(), 20).until(ExpectedConditions.visibilityOfElementLocated(
new By.ByClassName("name")));
userPage.update(user, user, password, email, phone, tenant)
.goToNav(ResourcePage.class)
.goToTab(UdfManagePage.class);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java | @AfterAll
@SneakyThrows
public static void cleanup() {
Files.walk(Constants.HOST_CHROME_DOWNLOAD_PATH)
.sorted(Comparator.reverseOrder())
.map(Path::toFile)
.forEach(File::delete);
Files.deleteIfExists(testUploadUdfFilePath);
}
@Test
@Order(10)
void testCreateDirectory() {
final UdfManagePage page = new UdfManagePage(browser);
new WebDriverWait(page.driver(), 10)
.until(ExpectedConditions.urlContains("/resource-manage"));
page.createDirectory(testDirectoryName, "test_desc");
await().untilAsserted(() -> assertThat(page.udfList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testDirectoryName)));
}
@Test
@Order(30)
void testDeleteDirectory() {
final UdfManagePage page = new UdfManagePage(browser);
page.delete(testDirectoryName);
await().untilAsserted(() -> {
browser.navigate().refresh();
assertThat(
page.udfList() |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 8,878 | [Bug] [UI-Next] Cannot update tenant individually on user info site. | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
When i want to update the tenant individually on user info site, but the 'password' field is a required.
I think this password field should not be required, because i want to set tenant individually.
<img width="590" alt="image" src="https://user-images.githubusercontent.com/29528966/158149934-7d95d106-2f27-488a-b73c-4e1a04bd4b91.png">
### What you expected to happen
I can update the tenant individually on user info site.
### How to reproduce
update the user info
### Anything else
_No response_
### Version
dev
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/8878 | https://github.com/apache/dolphinscheduler/pull/9237 | 3e8231271351454dacd3e9b6edab0a17fdc81a68 | 0d0674df1f78d666fc7c2155629627380aa0a9b1 | 2022-03-14T10:08:59Z | java | 2022-03-28T09:55:15Z | dolphinscheduler-e2e/dolphinscheduler-e2e-case/src/test/java/org/apache/dolphinscheduler/e2e/cases/UdfManageE2ETest.java | ).noneMatch(
it -> it.getText().contains(testDirectoryName)
);
});
}
@Test
@Order(40)
@SneakyThrows
void testUploadUdf() {
final UdfManagePage page = new UdfManagePage(browser);
downloadFile("https:repo1.maven.org/maven2/org/apache/hive/hive-jdbc/3.1.2/hive-jdbc-3.1.2.jar", testUploadUdfFilePath.toFile().getAbsolutePath());
page.uploadFile(testUploadUdfFilePath.toFile().getAbsolutePath());
await().untilAsserted(() -> {
assertThat(page.udfList())
.as("File list should contain newly-created file")
.extracting(WebElement::getText)
.anyMatch(it -> it.contains(testUploadUdfFileName));
});
}
void downloadFile(String downloadUrl, String filePath) throws Exception {
int byteRead;
URL url = new URL(downloadUrl);
URLConnection conn = url.openConnection();
InputStream inStream = conn.getInputStream();
FileOutputStream fs = new FileOutputStream(filePath);
byte[] buffer = new byte[1024];
while ((byteRead = inStream.read(buffer)) != -1) {
fs.write(buffer, 0, byteRead);
}
inStream.close(); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.