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 | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | @ApiImplicitParams({
@ApiImplicitParam(name = "name", value = "NAME", dataType = "String"),
@ApiImplicitParam(name = "projectCode", value = "PROJECT_CODE", type = "Long"),
@ApiImplicitParam(name = "description", value = "DESCRIPTION", dataType = "String"),
@ApiImplicitParam(name = "groupSize", value = "GROUPSIZE", dataType = "Int"),
})
@PostMapping(value = "/create")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(CREATE_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result createTaskGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("name") String name,
@RequestParam(value = "projectCode", required = false, defaultValue = "0") Long projectcode,
@RequestParam("description") String description,
@RequestParam("groupSize") Integer groupSize) {
Map<String, Object> result = taskGroupService.createTaskGroup(loginUser, projectcode, name, description, groupSize);
return returnDataList(result);
}
/**
* update task group list
*
* @param loginUser login user
* @param name name
* @param description description
* @param groupSize group size
* @param name project id
* @return result and msg code
*/
@ApiOperation(value = "update", notes = "UPDATE_TAKS_GROUP_NOTE")
@ApiImplicitParams({ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | @ApiImplicitParam(name = "id", value = "id", dataType = "Int"),
@ApiImplicitParam(name = "name", value = "NAME", dataType = "String"),
@ApiImplicitParam(name = "description", value = "DESCRIPTION", dataType = "String"),
@ApiImplicitParam(name = "groupSize", value = "GROUPSIZE", dataType = "Int"),
})
@PostMapping(value = "/update")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(UPDATE_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result updateTaskGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("id") Integer id,
@RequestParam("name") String name,
@RequestParam("description") String description,
@RequestParam("groupSize") Integer groupSize) {
Map<String, Object> result = taskGroupService.updateTaskGroup(loginUser, id, name, description, groupSize);
return returnDataList(result);
}
/**
* query task group list paging
*
* @param loginUser login user
* @param pageNo page number
* @param pageSize page size
* @return queue list
*/
@ApiOperation(value = "list-paging", notes = "QUERY_ALL_TASK_GROUP_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"),
@ApiImplicitParam(name = "name", value = "NAME", required = false, dataType = "String"),
@ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20") |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | })
@GetMapping(value = "/list-paging")
@ResponseStatus(HttpStatus.OK)
@ApiException(QUERY_TASK_GROUP_LIST_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result queryAllTaskGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam(value = "name", required = false) String name,
@RequestParam(value = "status", required = false) Integer status,
@RequestParam("pageNo") Integer pageNo,
@RequestParam("pageSize") Integer pageSize) {
Map<String, Object> result = taskGroupService.queryAllTaskGroup(loginUser, name, status, pageNo, pageSize);
return returnDataList(result);
}
/**
* query task group list paging
*
* @param loginUser login user
* @param pageNo page number
* @param status status
* @param pageSize page size
* @return queue list
*/
@ApiOperation(value = "queryTaskGroupByStatus", notes = "QUERY_TASK_GROUP_LIST_BY_STSATUS_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20"),
@ApiImplicitParam(name = "status", value = "status", required = true, dataType = "Int")
})
@GetMapping(value = "/query-list-by-status")
@ResponseStatus(HttpStatus.OK) |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | @ApiException(QUERY_TASK_GROUP_LIST_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result queryTaskGroupByStatus(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("pageNo") Integer pageNo,
@RequestParam(value = "status", required = false) Integer status,
@RequestParam("pageSize") Integer pageSize) {
Map<String, Object> result = taskGroupService.queryTaskGroupByStatus(loginUser, pageNo, pageSize, status);
return returnDataList(result);
}
/**
* query task group list paging by project id
*
* @param loginUser login user
* @param pageNo page number
* @param projectCode project id
* @param pageSize page size
* @return queue list
*/
@ApiOperation(value = "queryTaskGroupByName", notes = "QUERY_TASK_GROUP_LIST_BY_PROJECT_ID_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20"),
@ApiImplicitParam(name = "projectCode", value = "PROJECT_CODE", required = true, dataType = "String")
})
@GetMapping(value = "/query-list-by-projectCode")
@ResponseStatus(HttpStatus.OK)
@ApiException(QUERY_TASK_GROUP_LIST_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result queryTaskGroupByCode(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("pageNo") Integer pageNo, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | @RequestParam(value = "projectCode", required = false) Long projectCode,
@RequestParam("pageSize") Integer pageSize) {
Map<String, Object> result = taskGroupService.queryTaskGroupByProjectCode(loginUser, pageNo, pageSize, projectCode);
return returnDataList(result);
}
/**
* close a task group
*
* @param loginUser login user
* @param id id
* @return result
*/
@ApiOperation(value = "closeTaskGroup", notes = "CLOSE_TASK_GROUP_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Int")
})
@PostMapping(value = "/close-task-group")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(CLOSE_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result closeTaskGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam(value = "id", required = false) Integer id) {
Map<String, Object> result = taskGroupService.closeTaskGroup(loginUser, id);
return returnDataList(result);
}
/**
* start a task group
*
* @param loginUser login user
* @param id id |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | * @return result
*/
@ApiOperation(value = "startTaskGroup", notes = "START_TASK_GROUP_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "id", value = "ID", required = true, dataType = "Int")
})
@PostMapping(value = "/start-task-group")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(START_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result startTaskGroup(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam(value = "id", required = false) Integer id) {
Map<String, Object> result = taskGroupService.startTaskGroup(loginUser, id);
return returnDataList(result);
}
/**
* force start task without task group
*
* @param loginUser login user
* @param queueId task group queue id
* @return result
*/
@ApiOperation(value = "forceStart", notes = "WAKE_TASK_COMPULSIVELY_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "queueId", value = "TASK_GROUP_QUEUEID", required = true, dataType = "Int")
})
@PostMapping(value = "/forceStart")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(START_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser") |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | public Result forceStart(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam(value = "queueId") Integer queueId) {
Map<String, Object> result = taskGroupService.forceStartTask(loginUser, queueId);
return returnDataList(result);
}
/**
* force start task without task group
*
* @param loginUser login user
* @param queueId task group queue id
* @return result
*/
@ApiOperation(value = "modifyPriority", notes = "WAKE_TASK_COMPULSIVELY_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "queueId", value = "TASK_GROUP_QUEUEID", required = true, dataType = "Int"),
@ApiImplicitParam(name = "priority", value = "TASK_GROUP_QUEUE_PRIORITY", required = true, dataType = "Int")
})
@PostMapping(value = "/modifyPriority")
@ResponseStatus(HttpStatus.CREATED)
@ApiException(START_TASK_GROUP_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result modifyPriority(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam(value = "queueId") Integer queueId,
@RequestParam(value = "priority") Integer priority) {
Map<String, Object> result = taskGroupService.modifyPriority(loginUser, queueId,priority);
return returnDataList(result);
}
@Autowired
private TaskGroupQueueService taskGroupQueueService;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java | * query task group queue list paging
*
* @param loginUser login user
* @param pageNo page number
* @param pageSize page size
* @return queue list
*/
@ApiOperation(value = "queryTasksByGroupId", notes = "QUERY_ALL_TASKS_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "groupId", value = "GROUP_ID", required = true, dataType = "Int", example = "1"),
@ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataType = "Int", example = "1"),
@ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataType = "Int", example = "20")
})
@GetMapping(value = "/query-list-by-group-id")
@ResponseStatus(HttpStatus.OK)
@ApiException(QUERY_TASK_GROUP_QUEUE_LIST_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result queryTasksByGroupId(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("groupId") Integer groupId,
@RequestParam(value = "taskInstanceName",required = false) String taskName,
@RequestParam(value = "processInstanceName",required = false) String processName,
@RequestParam(value = "status",required = false) Integer status,
@RequestParam("pageNo") Integer pageNo,
@RequestParam("pageSize") Integer pageSize) {
Map<String, Object> result = taskGroupQueueService.queryTasksByGroupId(loginUser, taskName,processName,status,
groupId, pageNo, pageSize);
return returnDataList(result);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.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.dao.entity.User;
import java.util.Map;
/**
* task group service
*/
public interface TaskGroupService { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java | /**
* create a Task group
*
* @param loginUser login user
* @param name task group name
* @param description task group description
* @param groupSize task group total size
* @return the result code and msg
*/
Map<String, Object> createTaskGroup(User loginUser, Long projectCode, String name,
String description, int groupSize);
/**
* update the task group
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java | * @param loginUser login user
* @param name task group name
* @param description task group description
* @param groupSize task group total size
* @return the result code and msg
*/
Map<String, Object> updateTaskGroup(User loginUser, int id, String name,
String description, int groupSize);
/**
* get task group status
*
* @param id task group id
* @return the result code and msg
*/
boolean isTheTaskGroupAvailable(int id);
/**
* query all task group by user id
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @return the result code and msg
*/
Map<String, Object> queryAllTaskGroup(User loginUser, String name,Integer status, int pageNo, int pageSize);
/**
* query all task group by status
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java | * @param status status
* @return the result code and msg
*/
Map<String, Object> queryTaskGroupByStatus(User loginUser, int pageNo, int pageSize, int status);
/**
* query all task group by name
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @param name name
* @return the result code and msg
*/
Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode);
/**
* query all task group by id
*
* @param loginUser login user
* @param id id
* @return the result code and msg
*/
Map<String, Object> queryTaskGroupById(User loginUser, int id);
/**
* query
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @param userId user id
* @param name name |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java | * @param status status
* @return the result code and msg
*/
Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int userId, String name, Integer status);
/**
* close a task group
*
* @param loginUser login user
* @param id task group id
* @return the result code and msg
*/
Map<String, Object> closeTaskGroup(User loginUser, int id);
/**
* start a task group
*
* @param loginUser login user
* @param id task group id
* @return the result code and msg
*/
Map<String, Object> startTaskGroup(User loginUser, int id);
/**
* wake a task manually
*
* @param taskId task id
* @return result
*/
Map<String, Object> forceStartTask(User loginUser, int taskId);
Map<String, Object> modifyPriority(User loginUser, Integer queueId, Integer priority);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.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, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | * 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 com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.dolphinscheduler.api.dto.gantt.Task;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.TaskGroupQueueService;
import org.apache.dolphinscheduler.api.service.TaskGroupService;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | * task Group Service
*/
@Service
public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupService {
@Autowired
private TaskGroupMapper taskGroupMapper;
@Autowired
private TaskGroupQueueService taskGroupQueueService;
@Autowired
private ProcessService processService;
private static final Logger logger = LoggerFactory.getLogger(TaskGroupServiceImpl.class);
/**
* create a Task group
*
* @param loginUser login user
* @param name task group name
* @param description task group description
* @param groupSize task group total size
* @return the result code and msg
*/
@Override
public Map<String, Object> createTaskGroup(User loginUser, Long projectCode, String name, String description, int groupSize) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
if (name == null) {
putMsg(result, Status.NAME_NULL);
return result;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | if (groupSize <= 0) {
putMsg(result, Status.TASK_GROUP_SIZE_ERROR);
return result;
}
TaskGroup taskGroup1 = taskGroupMapper.queryByName(loginUser.getId(), name);
if (taskGroup1 != null) {
putMsg(result, Status.TASK_GROUP_NAME_EXSIT);
return result;
}
TaskGroup taskGroup = new TaskGroup(name, projectCode, description,
groupSize, loginUser.getId(), Flag.YES.getCode());
taskGroup.setCreateTime(new Date());
taskGroup.setUpdateTime(new Date());
if (taskGroupMapper.insert(taskGroup) > 0) {
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.CREATE_TASK_GROUP_ERROR);
return result;
}
return result;
}
/**
* update the task group
*
* @param loginUser login user
* @param name task group name
* @param description task group description
* @param groupSize task group total size
* @return the result code and msg
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | @Override
public Map<String, Object> updateTaskGroup(User loginUser, int id, String name, String description, int groupSize) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
if (name == null) {
putMsg(result, Status.NAME_NULL);
return result;
}
if (groupSize <= 0) {
putMsg(result, Status.TASK_GROUP_SIZE_ERROR);
return result;
}
Integer exists = taskGroupMapper.selectCount(new QueryWrapper<TaskGroup>().lambda().eq(TaskGroup::getName, name).ne(TaskGroup::getId, id));
if (exists > 0) {
putMsg(result, Status.TASK_GROUP_NAME_EXSIT);
return result;
}
TaskGroup taskGroup = taskGroupMapper.selectById(id);
if (taskGroup.getStatus() != Flag.YES.getCode()) {
putMsg(result, Status.TASK_GROUP_STATUS_ERROR);
return result;
}
taskGroup.setGroupSize(groupSize);
taskGroup.setDescription(description);
taskGroup.setUpdateTime(new Date());
if (StringUtils.isNotEmpty(name)) {
taskGroup.setName(name);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | int i = taskGroupMapper.updateById(taskGroup);
logger.info("update result:{}", i);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* get task group status
*
* @param id task group id
* @return is the task group available
*/
@Override
public boolean isTheTaskGroupAvailable(int id) {
return taskGroupMapper.selectCountByIdStatus(id, Flag.YES.getCode()) == 1;
}
/**
* query all task group by user id
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @return the result code and msg
*/
@Override
public Map<String, Object> queryAllTaskGroup(User loginUser, String name, Integer status, int pageNo, int pageSize) {
return this.doQuery(loginUser, pageNo, pageSize, loginUser.getId(), name, status);
}
/**
* query all task group by status
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | * @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @param status status
* @return the result code and msg
*/
@Override
public Map<String, Object> queryTaskGroupByStatus(User loginUser, int pageNo, int pageSize, int status) {
return this.doQuery(loginUser, pageNo, pageSize, loginUser.getId(), null, status);
}
/**
* query all task group by name
*
* @param loginUser login user
* @param pageNo page no
* @param pageSize page size
* @param projectCode project code
* @return the result code and msg
*/
@Override
public Map<String, Object> queryTaskGroupByProjectCode(User loginUser, int pageNo, int pageSize, Long projectCode) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
Page<TaskGroup> page = new Page<>(pageNo, pageSize);
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPagingByProjectCode(page, projectCode);
return getStringObjectMap(pageNo, pageSize, result, taskGroupPaging);
}
private Map<String, Object> getStringObjectMap(int pageNo, int pageSize, Map<String, Object> result, IPage<TaskGroup> taskGroupPaging) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | PageInfo<TaskGroup> pageInfo = new PageInfo<>(pageNo, pageSize);
int total = taskGroupPaging == null ? 0 : (int) taskGroupPaging.getTotal();
List<TaskGroup> list = taskGroupPaging == null ? new ArrayList<TaskGroup>() : taskGroupPaging.getRecords();
pageInfo.setTotal(total);
pageInfo.setTotalList(list);
result.put(Constants.DATA_LIST, pageInfo);
logger.info("select result:{}", taskGroupPaging);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query all task group by id
*
* @param loginUser login user
* @param id id
* @return the result code and msg
*/
@Override
public Map<String, Object> queryTaskGroupById(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
TaskGroup taskGroup = taskGroupMapper.selectById(id);
result.put(Constants.DATA_LIST, taskGroup);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | *
* @param pageNo page no
* @param pageSize page size
* @param userId user id
* @param name name
* @param status status
* @return the result code and msg
*/
@Override
public Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize, int userId, String name, Integer status) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
Page<TaskGroup> page = new Page<>(pageNo, pageSize);
IPage<TaskGroup> taskGroupPaging = taskGroupMapper.queryTaskGroupPaging(page, userId, name, status);
return getStringObjectMap(pageNo, pageSize, result, taskGroupPaging);
}
/**
* close a task group
*
* @param loginUser login user
* @param id task group id
* @return the result code and msg
*/
@Override
public Map<String, Object> closeTaskGroup(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | }
TaskGroup taskGroup = taskGroupMapper.selectById(id);
taskGroup.setStatus(Flag.NO.getCode());
taskGroupMapper.updateById(taskGroup);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* start a task group
*
* @param loginUser login user
* @param id task group id
* @return the result code and msg
*/
@Override
public Map<String, Object> startTaskGroup(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
TaskGroup taskGroup = taskGroupMapper.selectById(id);
if (taskGroup.getStatus() == 1) {
putMsg(result, Status.TASK_GROUP_STATUS_ERROR);
return result;
}
taskGroup.setStatus(1);
taskGroup.setUpdateTime(new Date(System.currentTimeMillis()));
int update = taskGroupMapper.updateById(taskGroup);
putMsg(result, Status.SUCCESS);
return result; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,701 | [Bug] [DAO] There's an redundant field named 'project_id' in the table of 't_ds_task_group'. | ### 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
In the table of 't_ds_task_group' there's two fields of 'project_code' and 'project_id'. Each of them can identify the project, and the class of 'TaskGroup' doesn't use this field. So need to remove it from the table and improve a few wrong annotations.
### What you expected to happen
I expect to remove the redundant field 'project_id' in the table 't_ds_task_group'.
### How to reproduce
See it in the project.
### 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/7701 | https://github.com/apache/dolphinscheduler/pull/7703 | 5ab0135d1831c9156388d8b593417e775e2b2b84 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | 2021-12-29T02:52:14Z | java | 2021-12-29T04:57:36Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java | }
/**
* wake a task manually
*
* @param loginUser
* @param queueId task group queue id
* @return result
*/
@Override
public Map<String, Object> forceStartTask(User loginUser, int queueId) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
taskGroupQueueService.forceStartTask(queueId, Flag.YES.getCode());
putMsg(result, Status.SUCCESS);
return result;
}
@Override
public Map<String, Object> modifyPriority(User loginUser, Integer queueId, Integer priority) {
Map<String, Object> result = new HashMap<>();
if (isNotAdmin(loginUser, result)) {
return result;
}
taskGroupQueueService.modifyPriority(queueId, priority);
putMsg(result, Status.SUCCESS);
return result;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.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
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | * 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.server.master.registry;
import static org.apache.dolphinscheduler.common.Constants.REGISTRY_DOLPHINSCHEDULER_MASTERS;
import static org.apache.dolphinscheduler.common.Constants.REGISTRY_DOLPHINSCHEDULER_NODE;
import static org.apache.dolphinscheduler.common.Constants.SLEEP_TIME_MILLIS;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.IStoppable;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.NodeType;
import org.apache.dolphinscheduler.common.enums.StateEvent;
import org.apache.dolphinscheduler.common.enums.StateEventType;
import org.apache.dolphinscheduler.common.model.Server;
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.common.utils.NetUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.registry.api.ConnectionState;
import org.apache.dolphinscheduler.remote.utils.NamedThreadFactory;
import org.apache.dolphinscheduler.server.builder.TaskExecutionContextBuilder;
import org.apache.dolphinscheduler.server.master.config.MasterConfig;
import org.apache.dolphinscheduler.server.master.runner.WorkflowExecuteThreadPool;
import org.apache.dolphinscheduler.server.registry.HeartBeatTask;
import org.apache.dolphinscheduler.server.utils.ProcessUtils; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.dolphinscheduler.service.queue.entity.TaskExecutionContext;
import org.apache.dolphinscheduler.service.registry.RegistryClient;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.time.Duration;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.google.common.collect.Sets;
/**
* zookeeper master client
* <p>
* single instance
*/
@Component
public class MasterRegistryClient {
/**
* logger
*/
private static final Logger logger = LoggerFactory.getLogger(MasterRegistryClient.class); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | /**
* process service
*/
@Autowired
private ProcessService processService;
@Autowired
private RegistryClient registryClient;
/**
* master config
*/
@Autowired
private MasterConfig masterConfig;
/**
* heartbeat executor
*/
private ScheduledExecutorService heartBeatExecutor;
@Autowired
private WorkflowExecuteThreadPool workflowExecuteThreadPool;
/**
* master startup time, ms
*/
private long startupTime;
private String localNodePath;
public void init() {
this.startupTime = System.currentTimeMillis();
this.heartBeatExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("HeartBeatExecutor"));
}
public void start() {
String nodeLock = Constants.REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_STARTUP_MASTERS;
try { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | registryClient.getLock(nodeLock);
registry();
String registryPath = getMasterPath();
registryClient.handleDeadServer(Collections.singleton(registryPath), NodeType.MASTER, Constants.DELETE_OP);
while (!registryClient.checkNodeExists(NetUtils.getHost(), NodeType.MASTER)) {
ThreadUtils.sleep(SLEEP_TIME_MILLIS);
}
registryClient.subscribe(REGISTRY_DOLPHINSCHEDULER_NODE, new MasterRegistryDataListener());
} catch (Exception e) {
logger.error("master start up exception", e);
} finally {
registryClient.releaseLock(nodeLock);
}
}
public void setRegistryStoppable(IStoppable stoppable) {
registryClient.setStoppable(stoppable);
}
public void closeRegistry() {
deregister();
}
/**
* remove master node path
*
* @param path node path
* @param nodeType node type
* @param failover is failover |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | */
public void removeMasterNodePath(String path, NodeType nodeType, boolean failover) {
logger.info("{} node deleted : {}", nodeType, path);
if (StringUtils.isEmpty(path)) {
logger.error("server down error: empty path: {}, nodeType:{}", path, nodeType);
return;
}
String serverHost = registryClient.getHostByEventDataPath(path);
if (StringUtils.isEmpty(serverHost)) {
logger.error("server down error: unknown path: {}, nodeType:{}", path, nodeType);
return;
}
String failoverPath = getFailoverLockPath(nodeType, serverHost);
try {
registryClient.getLock(failoverPath);
if (!registryClient.exists(path)) {
logger.info("path: {} not exists", path);
registryClient.handleDeadServer(Collections.singleton(path), nodeType, Constants.ADD_OP);
}
if (failover) {
failoverServerWhenDown(serverHost, nodeType);
}
} catch (Exception e) {
logger.error("{} server failover failed, host:{}", nodeType, serverHost, e);
} finally {
registryClient.releaseLock(failoverPath);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | /**
* remove worker node path
*
* @param path node path
* @param nodeType node type
* @param failover is failover
*/
public void removeWorkerNodePath(String path, NodeType nodeType, boolean failover) {
logger.info("{} node deleted : {}", nodeType, path);
try {
String serverHost = null;
if (!StringUtils.isEmpty(path)) {
serverHost = registryClient.getHostByEventDataPath(path);
if (StringUtils.isEmpty(serverHost)) {
logger.error("server down error: unknown path: {}", path);
return;
}
if (!registryClient.exists(path)) {
logger.info("path: {} not exists", path);
registryClient.handleDeadServer(Collections.singleton(path), nodeType, Constants.ADD_OP);
}
}
if (failover) {
failoverServerWhenDown(serverHost, nodeType);
}
} catch (Exception e) {
logger.error("{} server failover failed", nodeType, e);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | }
private boolean isNeedToHandleDeadServer(String host, NodeType nodeType, Duration sessionTimeout) {
long sessionTimeoutMillis = Math.max(Constants.REGISTRY_SESSION_TIMEOUT, sessionTimeout.toMillis());
List<Server> serverList = registryClient.getServerList(nodeType);
if (CollectionUtils.isEmpty(serverList)) {
return true;
}
Date startupTime = getServerStartupTime(serverList, host);
if (startupTime == null) {
return true;
}
if (System.currentTimeMillis() - startupTime.getTime() > sessionTimeoutMillis) {
return true;
}
return false;
}
/**
* failover server when server down
*
* @param serverHost server host
* @param nodeType zookeeper node type
*/
private void failoverServerWhenDown(String serverHost, NodeType nodeType) {
switch (nodeType) {
case MASTER:
failoverMaster(serverHost);
break;
case WORKER:
failoverWorker(serverHost);
break; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | default:
break;
}
}
/**
* get failover lock path
*
* @param nodeType zookeeper node type
* @return fail over lock path
*/
public String getFailoverLockPath(NodeType nodeType, String host) {
switch (nodeType) {
case MASTER:
return Constants.REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_MASTERS + "/" + host;
case WORKER:
return Constants.REGISTRY_DOLPHINSCHEDULER_LOCK_FAILOVER_WORKERS + "/" + host;
default:
return "";
}
}
/**
* task needs failover if task start before worker starts
*
* @param workerServers worker servers
* @param taskInstance task instance
* @return true if task instance need fail over
*/
private boolean checkTaskInstanceNeedFailover(List<Server> workerServers, TaskInstance taskInstance) {
boolean taskNeedFailover = true; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | if (taskInstance.getHost() == null) {
return false;
}
if (checkTaskAfterWorkerStart(workerServers, taskInstance)) {
taskNeedFailover = false;
}
return taskNeedFailover;
}
/**
* check task start after the worker server starts.
*
* @param taskInstance task instance
* @return true if task instance start time after worker server start date
*/
private boolean checkTaskAfterWorkerStart(List<Server> workerServers, TaskInstance taskInstance) {
if (StringUtils.isEmpty(taskInstance.getHost())) {
return false;
}
Date workerServerStartDate = getServerStartupTime(workerServers, taskInstance.getHost());
if (workerServerStartDate != null) {
if (taskInstance.getStartTime() == null) {
return taskInstance.getSubmitTime().after(workerServerStartDate);
} else {
return taskInstance.getStartTime().after(workerServerStartDate);
}
}
return false;
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | * get server startup time
*/
private Date getServerStartupTime(List<Server> servers, String host) {
if (CollectionUtils.isEmpty(servers)) {
return null;
}
Date serverStartupTime = null;
for (Server server : servers) {
if (host.equals(server.getHost() + Constants.COLON + server.getPort())) {
serverStartupTime = server.getCreateTime();
break;
}
}
return serverStartupTime;
}
/**
* get server startup time
*/
private Date getServerStartupTime(NodeType nodeType, String host) {
if (StringUtils.isEmpty(host)) {
return null;
}
List<Server> servers = registryClient.getServerList(nodeType);
return getServerStartupTime(servers, host);
}
/**
* failover worker tasks
* <p>
* 1. kill yarn job if there are yarn jobs in tasks.
* 2. change task state from running to need failover. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | * 3. failover all tasks when workerHost is null
*
* @param workerHost worker host
*/
private void failoverWorker(String workerHost) {
if (StringUtils.isEmpty(workerHost)) {
return;
}
List<Server> workerServers = registryClient.getServerList(NodeType.WORKER);
long startTime = System.currentTimeMillis();
List<TaskInstance> needFailoverTaskInstanceList = processService.queryNeedFailoverTaskInstances(workerHost);
Map<Integer, ProcessInstance> processInstanceCacheMap = new HashMap<>();
logger.info("start worker[{}] failover, task list size:{}", workerHost, needFailoverTaskInstanceList.size());
for (TaskInstance taskInstance : needFailoverTaskInstanceList) {
ProcessInstance processInstance = processInstanceCacheMap.get(taskInstance.getProcessInstanceId());
if (processInstance == null) {
processInstance = processService.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
if (processInstance == null) {
logger.error("failover task instance error, processInstance {} of taskInstance {} is null",
taskInstance.getProcessInstanceId(), taskInstance.getId());
continue;
}
processInstanceCacheMap.put(processInstance.getId(), processInstance);
}
if (!checkTaskInstanceNeedFailover(workerServers, taskInstance)) {
continue;
}
if (!processInstance.getHost().equalsIgnoreCase(getLocalAddress())) {
continue; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | }
logger.info("failover task instance id: {}, process instance id: {}", taskInstance.getId(), taskInstance.getProcessInstanceId());
failoverTaskInstance(processInstance, taskInstance);
}
logger.info("end worker[{}] failover, useTime:{}ms", workerHost, System.currentTimeMillis() - startTime);
}
/**
* failover master
* <p>
* failover process instance and associated task instance
*
* @param masterHost master host
*/
public void failoverMaster(String masterHost) {
if (StringUtils.isEmpty(masterHost)) {
return;
}
Date serverStartupTime = getServerStartupTime(NodeType.MASTER, masterHost);
List<Server> workerServers = registryClient.getServerList(NodeType.WORKER);
long startTime = System.currentTimeMillis();
List<ProcessInstance> needFailoverProcessInstanceList = processService.queryNeedFailoverProcessInstances(masterHost);
logger.info("start master[{}] failover, process list size:{}", masterHost, needFailoverProcessInstanceList.size());
for (ProcessInstance processInstance : needFailoverProcessInstanceList) {
if (Constants.NULL.equals(processInstance.getHost())) {
continue;
}
List<TaskInstance> validTaskInstanceList = processService.findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : validTaskInstanceList) {
if (Constants.NULL.equals(taskInstance.getHost())) {
continue; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | }
if (taskInstance.getState().typeIsFinished()) {
continue;
}
if (!checkTaskInstanceNeedFailover(workerServers, taskInstance)) {
continue;
}
logger.info("failover task instance id: {}, process instance id: {}", taskInstance.getId(), taskInstance.getProcessInstanceId());
failoverTaskInstance(processInstance, taskInstance);
}
if (serverStartupTime != null && processInstance.getRestartTime() != null
&& processInstance.getRestartTime().after(serverStartupTime)) {
continue;
}
logger.info("failover process instance id: {}", processInstance.getId());
processService.processNeedFailoverProcessInstances(processInstance);
}
logger.info("master[{}] failover end, useTime:{}ms", masterHost, System.currentTimeMillis() - startTime);
}
/**
* failover task instance
* <p>
* 1. kill yarn job if there are yarn jobs in tasks.
* 2. change task state from running to need failover.
* 3. try to notify local master
*/
private void failoverTaskInstance(ProcessInstance processInstance, TaskInstance taskInstance) {
if (taskInstance == null) {
logger.error("failover task instance error, taskInstance is null"); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | return;
}
if (processInstance == null) {
logger.error("failover task instance error, processInstance {} of taskInstance {} is null",
taskInstance.getProcessInstanceId(), taskInstance.getId());
return;
}
taskInstance.setProcessInstance(processInstance);
TaskExecutionContext taskExecutionContext = TaskExecutionContextBuilder.get()
.buildTaskInstanceRelatedInfo(taskInstance)
.buildProcessInstanceRelatedInfo(processInstance)
.create();
if (masterConfig.isKillYarnJobWhenTaskFailover()) {
ProcessUtils.killYarnJob(taskExecutionContext);
}
taskInstance.setState(ExecutionStatus.NEED_FAULT_TOLERANCE);
processService.saveTaskInstance(taskInstance);
StateEvent stateEvent = new StateEvent();
stateEvent.setTaskInstanceId(taskInstance.getId());
stateEvent.setType(StateEventType.TASK_STATE_CHANGE);
stateEvent.setProcessInstanceId(processInstance.getId());
stateEvent.setExecutionStatus(taskInstance.getState());
workflowExecuteThreadPool.submitStateEvent(stateEvent);
}
/**
* registry
*/
public void registry() {
String address = NetUtils.getAddr(masterConfig.getListenPort()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | localNodePath = getMasterPath();
int masterHeartbeatInterval = masterConfig.getHeartbeatInterval();
HeartBeatTask heartBeatTask = new HeartBeatTask(startupTime,
masterConfig.getMaxCpuLoadAvg(),
masterConfig.getReservedMemory(),
Sets.newHashSet(getMasterPath()),
Constants.MASTER_TYPE,
registryClient);
registryClient.persistEphemeral(localNodePath, heartBeatTask.getHeartBeatInfo());
registryClient.addConnectionStateListener(this::handleConnectionState);
this.heartBeatExecutor.scheduleAtFixedRate(heartBeatTask, masterHeartbeatInterval, masterHeartbeatInterval, TimeUnit.SECONDS);
logger.info("master node : {} registry to ZK successfully with heartBeatInterval : {}s", address, masterHeartbeatInterval);
}
public void handleConnectionState(ConnectionState state) {
switch (state) {
case CONNECTED:
logger.debug("registry connection state is {}", state);
break;
case SUSPENDED:
logger.warn("registry connection state is {}, ready to retry connection", state);
break;
case RECONNECTED:
logger.debug("registry connection state is {}, clean the node info", state);
registryClient.persistEphemeral(localNodePath, "");
break;
case DISCONNECTED:
logger.warn("registry connection state is {}, ready to stop myself", state);
registryClient.getStoppable().stop("registry connection state is DISCONNECTED, stop myself");
break;
default: |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/registry/MasterRegistryClient.java | }
}
public void deregister() {
try {
String address = getLocalAddress();
String localNodePath = getMasterPath();
registryClient.remove(localNodePath);
logger.info("master node : {} unRegistry to register center.", address);
heartBeatExecutor.shutdown();
logger.info("heartbeat executor shutdown");
registryClient.close();
} catch (Exception e) {
logger.error("remove registry path exception ", e);
}
}
/**
* get master path
*/
public String getMasterPath() {
String address = getLocalAddress();
return REGISTRY_DOLPHINSCHEDULER_MASTERS + "/" + address;
}
/**
* get local address
*/
public String getLocalAddress() {
return NetUtils.getAddr(masterConfig.getListenPort());
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.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.
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java | package org.apache.dolphinscheduler.server.worker.registry;
import static org.apache.dolphinscheduler.common.Constants.DEFAULT_WORKER_GROUP;
import static org.apache.dolphinscheduler.common.Constants.REGISTRY_DOLPHINSCHEDULER_WORKERS;
import static org.apache.dolphinscheduler.common.Constants.SINGLE_SLASH;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.IStoppable;
import org.apache.dolphinscheduler.common.enums.NodeType;
import org.apache.dolphinscheduler.common.utils.NetUtils;
import org.apache.dolphinscheduler.remote.utils.NamedThreadFactory;
import org.apache.dolphinscheduler.server.registry.HeartBeatTask;
import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;
import org.apache.dolphinscheduler.server.worker.runner.WorkerManagerThread;
import org.apache.dolphinscheduler.service.registry.RegistryClient;
import org.apache.commons.lang.StringUtils;
import java.io.IOException;
import java.util.Set;
import java.util.StringJoiner;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import javax.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.google.common.collect.Sets;
/**
* worker registry
*/
@Service |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java | public class WorkerRegistryClient {
private final Logger logger = LoggerFactory.getLogger(WorkerRegistryClient.class);
/**
* worker config
*/
@Autowired
private WorkerConfig workerConfig;
/**
* worker manager
*/
@Autowired
private WorkerManagerThread workerManagerThread;
/**
* heartbeat executor
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java | private ScheduledExecutorService heartBeatExecutor;
@Autowired
private RegistryClient registryClient;
/**
* worker startup time, ms
*/
private long startupTime;
private Set<String> workerGroups;
@PostConstruct
public void initWorkRegistry() {
this.workerGroups = workerConfig.getGroups();
this.startupTime = System.currentTimeMillis();
this.heartBeatExecutor = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("HeartBeatExecutor"));
}
/**
* registry
*/
public void registry() {
String address = NetUtils.getAddr(workerConfig.getListenPort());
Set<String> workerZkPaths = getWorkerZkPaths();
int workerHeartbeatInterval = workerConfig.getHeartbeatInterval();
for (String workerZKPath : workerZkPaths) {
registryClient.persistEphemeral(workerZKPath, "");
logger.info("worker node : {} registry to ZK {} successfully", address, workerZKPath);
}
HeartBeatTask heartBeatTask = new HeartBeatTask(startupTime,
workerConfig.getMaxCpuLoadAvg(),
workerConfig.getReservedMemory(),
workerConfig.getHostWeight(),
workerZkPaths, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java | Constants.WORKER_TYPE,
registryClient,
workerConfig.getExecThreads(),
workerManagerThread.getThreadPoolQueueSize()
);
this.heartBeatExecutor.scheduleAtFixedRate(heartBeatTask, workerHeartbeatInterval, workerHeartbeatInterval, TimeUnit.SECONDS);
logger.info("worker node : {} heartbeat interval {} s", address, workerHeartbeatInterval);
}
/**
* remove registry info
*/
public void unRegistry() throws IOException {
try {
String address = getLocalAddress();
Set<String> workerZkPaths = getWorkerZkPaths();
for (String workerZkPath : workerZkPaths) {
registryClient.remove(workerZkPath);
logger.info("worker node : {} unRegistry from ZK {}.", address, workerZkPath);
}
} catch (Exception ex) {
logger.error("remove worker zk path exception", ex);
}
this.heartBeatExecutor.shutdownNow();
logger.info("heartbeat executor shutdown");
registryClient.close();
logger.info("registry client closed");
}
/**
* get worker path
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,686 | [Bug] [MasterServer] server restart fail after force killed | ### 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 kill the worker server by force kill, and restart it, it will stop because dead server.
And I found that the session timeout was still happen as usual in seconds, even if this is already a new server.
So the master accept the remove node event and handle dead server.
### What you expected to happen
server can restart successfully
### How to reproduce
kill server forcely and restart it.
### 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/7686 | https://github.com/apache/dolphinscheduler/pull/7688 | 71ccb42697e197b2668a08a83eb9bb19261b4f5a | d3bd7309fb623d87ae7f35a01bdaec727a672be4 | 2021-12-28T11:57:34Z | java | 2021-12-29T07:35:03Z | dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerRegistryClient.java | public Set<String> getWorkerZkPaths() {
Set<String> workerPaths = Sets.newHashSet();
String address = getLocalAddress();
for (String workGroup : this.workerGroups) {
StringJoiner workerPathJoiner = new StringJoiner(SINGLE_SLASH);
workerPathJoiner.add(REGISTRY_DOLPHINSCHEDULER_WORKERS);
if (StringUtils.isEmpty(workGroup)) {
workGroup = DEFAULT_WORKER_GROUP;
}
workerPathJoiner.add(workGroup.trim().toLowerCase());
workerPathJoiner.add(address);
workerPaths.add(workerPathJoiner.toString());
}
return workerPaths;
}
public void handleDeadServer(Set<String> nodeSet, NodeType nodeType, String opType) {
registryClient.handleDeadServer(nodeSet, nodeType, opType);
}
/**
* get local address
*/
private String getLocalAddress() {
return NetUtils.getAddr(workerConfig.getListenPort());
}
public void setRegistryStoppable(IStoppable stoppable) {
registryClient.setStoppable(stoppable);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,713 | [Feature] [Log] The data source password in the log is not encrypted | ### 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
The data source password in the log is not encrypted.
### What you expected to happen
It should be encrypted or replaced with "****"
### How to reproduce
See "What happened"
### 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/7713 | https://github.com/apache/dolphinscheduler/pull/7728 | 68906f1b31d60e38414de6a82feff5232e4a00b4 | 73993e98ee272ccbd1a0bb160eda5c7557ddc21e | 2021-12-29T10:47:52Z | java | 2021-12-30T08:09:59Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.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.aspect;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
import java.lang.reflect.Method; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,713 | [Feature] [Log] The data source password in the log is not encrypted | ### 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
The data source password in the log is not encrypted.
### What you expected to happen
It should be encrypted or replaced with "****"
### How to reproduce
See "What happened"
### 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/7713 | https://github.com/apache/dolphinscheduler/pull/7728 | 68906f1b31d60e38414de6a82feff5232e4a00b4 | 73993e98ee272ccbd1a0bb160eda5c7557ddc21e | 2021-12-29T10:47:52Z | java | 2021-12-30T08:09:59Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java | import java.util.Arrays;
import java.util.HashMap;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Component;
import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
@Aspect
@Component
public class AccessLogAspect {
private static final Logger logger = LoggerFactory.getLogger(AccessLogAspect.class);
private static final String TRACE_ID = "traceId";
@Pointcut("@annotation(org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation)")
public void logPointCut(){
}
@Around("logPointCut()")
public Object doAround(ProceedingJoinPoint proceedingJoinPoint) throws Throwable {
long startTime = System.currentTimeMillis();
MethodSignature sign = (MethodSignature) proceedingJoinPoint.getSignature(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,713 | [Feature] [Log] The data source password in the log is not encrypted | ### 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
The data source password in the log is not encrypted.
### What you expected to happen
It should be encrypted or replaced with "****"
### How to reproduce
See "What happened"
### 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/7713 | https://github.com/apache/dolphinscheduler/pull/7728 | 68906f1b31d60e38414de6a82feff5232e4a00b4 | 73993e98ee272ccbd1a0bb160eda5c7557ddc21e | 2021-12-29T10:47:52Z | java | 2021-12-30T08:09:59Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java | Method method = sign.getMethod();
AccessLogAnnotation annotation = method.getAnnotation(AccessLogAnnotation.class);
String traceId = UUID.randomUUID().toString();
if (!annotation.ignoreRequest()) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
String traceIdFromHeader = request.getHeader(TRACE_ID);
if (!StringUtils.isEmpty(traceIdFromHeader)) {
traceId = traceIdFromHeader;
}
String userName = parseLoginInfo(request);
String argsString = parseArgs(proceedingJoinPoint, annotation);
logger.info("REQUEST TRACE_ID:{}, LOGIN_USER:{}, URI:{}, METHOD:{}, HANDLER:{}, ARGS:{}",
traceId,
userName,
request.getRequestURI(),
request.getMethod(),
proceedingJoinPoint.getSignature().getDeclaringTypeName() + "." + proceedingJoinPoint.getSignature().getName(),
argsString);
}
}
Object ob = proceedingJoinPoint.proceed();
if (!annotation.ignoreResponse()) {
logger.info("RESPONSE TRACE_ID:{}, BODY:{}, REQUEST DURATION:{} milliseconds", traceId, ob, (System.currentTimeMillis() - startTime));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,713 | [Feature] [Log] The data source password in the log is not encrypted | ### 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
The data source password in the log is not encrypted.
### What you expected to happen
It should be encrypted or replaced with "****"
### How to reproduce
See "What happened"
### 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/7713 | https://github.com/apache/dolphinscheduler/pull/7728 | 68906f1b31d60e38414de6a82feff5232e4a00b4 | 73993e98ee272ccbd1a0bb160eda5c7557ddc21e | 2021-12-29T10:47:52Z | java | 2021-12-30T08:09:59Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java | return ob;
}
private String parseArgs(ProceedingJoinPoint proceedingJoinPoint, AccessLogAnnotation annotation) {
Object[] args = proceedingJoinPoint.getArgs();
String argsString = Arrays.toString(args);
if (annotation.ignoreRequestArgs().length > 0) {
String[] parameterNames = ((MethodSignature) proceedingJoinPoint.getSignature()).getParameterNames();
if (parameterNames.length > 0) {
Set<String> ignoreSet = Arrays.stream(annotation.ignoreRequestArgs()).collect(Collectors.toSet());
HashMap<String, Object> argsMap = new HashMap<>();
for (int i = 0; i < parameterNames.length; i++) {
if (!ignoreSet.contains(parameterNames[i])) {
argsMap.put(parameterNames[i], args[i]);
}
}
argsString = argsMap.toString();
}
}
return argsString;
}
private String parseLoginInfo(HttpServletRequest request) {
String userName = "NOT LOGIN";
User loginUser = (User) (request.getAttribute(Constants.SESSION_USER));
if (loginUser != null) {
userName = loginUser.getUserName();
}
return userName;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/targets/HiveTargetGenerator.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.task.sqoop.generator.targets;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.CREATE_HIVE_TABLE;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.DELETE_TARGET_DIR;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_DATABASE;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_DELIMS_REPLACEMENT;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_DROP_IMPORT_DELIMS;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_IMPORT;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_OVERWRITE;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_PARTITION_KEY; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/targets/HiveTargetGenerator.java | import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_PARTITION_VALUE;
import static org.apache.dolphinscheduler.plugin.task.sqoop.SqoopConstants.HIVE_TABLE;
import static org.apache.dolphinscheduler.spi.task.TaskConstants.SPACE;
import org.apache.dolphinscheduler.plugin.task.sqoop.generator.ITargetGenerator;
import org.apache.dolphinscheduler.plugin.task.sqoop.parameter.SqoopParameters;
import org.apache.dolphinscheduler.plugin.task.sqoop.parameter.targets.TargetHiveParameter;
import org.apache.dolphinscheduler.spi.task.request.TaskRequest;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* hive target generator
*/
public class HiveTargetGenerator implements ITargetGenerator {
private static final Logger logger = LoggerFactory.getLogger(HiveTargetGenerator.class);
@Override
public String generate(SqoopParameters sqoopParameters, TaskRequest taskExecutionContext) {
StringBuilder hiveTargetSb = new StringBuilder();
try {
TargetHiveParameter targetHiveParameter =
JSONUtils.parseObject(sqoopParameters.getTargetParams(), TargetHiveParameter.class);
if (null != targetHiveParameter) {
hiveTargetSb.append(SPACE).append(HIVE_IMPORT);
if (StringUtils.isNotEmpty(targetHiveParameter.getHiveDatabase())
&& StringUtils.isNotEmpty(targetHiveParameter.getHiveTable())) {
hiveTargetSb.append(SPACE).append(HIVE_DATABASE)
.append(SPACE).append(targetHiveParameter.getHiveDatabase())
.append(SPACE).append(HIVE_TABLE)
.append(SPACE).append(targetHiveParameter.getHiveTable()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/generator/targets/HiveTargetGenerator.java | }
if (targetHiveParameter.isCreateHiveTable()) {
hiveTargetSb.append(SPACE).append(CREATE_HIVE_TABLE);
}
if (targetHiveParameter.isDropDelimiter()) {
hiveTargetSb.append(SPACE).append(HIVE_DROP_IMPORT_DELIMS);
}
if (targetHiveParameter.isHiveOverWrite()) {
hiveTargetSb.append(SPACE).append(HIVE_OVERWRITE)
.append(SPACE).append(DELETE_TARGET_DIR);
}
if (StringUtils.isNotEmpty(targetHiveParameter.getReplaceDelimiter())) {
hiveTargetSb.append(SPACE).append(HIVE_DELIMS_REPLACEMENT)
.append(SPACE).append(targetHiveParameter.getReplaceDelimiter());
}
if (StringUtils.isNotEmpty(targetHiveParameter.getHivePartitionKey())
&& StringUtils.isNotEmpty(targetHiveParameter.getHivePartitionValue())) {
hiveTargetSb.append(SPACE).append(HIVE_PARTITION_KEY)
.append(SPACE).append(targetHiveParameter.getHivePartitionKey())
.append(SPACE).append(HIVE_PARTITION_VALUE)
.append(SPACE).append(targetHiveParameter.getHivePartitionValue());
}
}
} catch (Exception e) {
logger.error(String.format("Sqoop hive target params build failed: [%s]", e.getMessage()));
}
return hiveTargetSb.toString();
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/parameter/targets/TargetHiveParameter.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.task.sqoop.parameter.targets;
/**
* target hive parameter
*/
public class TargetHiveParameter { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/parameter/targets/TargetHiveParameter.java | /**
* hive database
*/
private String hiveDatabase;
/**
* hive table
*/
private String hiveTable;
/**
* create hive table
*/
private boolean createHiveTable;
/**
* drop delimiter
*/
private boolean dropDelimiter;
/**
* hive overwrite
*/
private boolean hiveOverWrite;
/**
* replace delimiter |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/parameter/targets/TargetHiveParameter.java | */
private String replaceDelimiter;
/**
* hive partition key
*/
private String hivePartitionKey;
/**
* hive partition value
*/
private String hivePartitionValue;
public String getHiveDatabase() {
return hiveDatabase;
}
public void setHiveDatabase(String hiveDatabase) {
this.hiveDatabase = hiveDatabase;
}
public String getHiveTable() {
return hiveTable;
}
public void setHiveTable(String hiveTable) {
this.hiveTable = hiveTable;
}
public boolean isCreateHiveTable() {
return createHiveTable;
}
public void setCreateHiveTable(boolean createHiveTable) {
this.createHiveTable = createHiveTable;
}
public boolean isDropDelimiter() {
return dropDelimiter; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,459 | [Bug][Sqoop] running error in parallel | ### 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
sqoop task misssing --target-dir in 2.0.1-release.
Causing error while running in parallel with the same source table in different database.
### What you expected to happen
running successfully
### How to reproduce
above
### Anything else
_No response_
### Version
2.0.1-release
### 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/7459 | https://github.com/apache/dolphinscheduler/pull/7752 | d7d13f7f51c5a2d6fd19076018ff5528f140c49a | c58dbefaa50224f60d581980a43ba3d2ee4634a2 | 2021-12-17T03:43:39Z | java | 2021-12-31T08:26:07Z | dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/parameter/targets/TargetHiveParameter.java | }
public void setDropDelimiter(boolean dropDelimiter) {
this.dropDelimiter = dropDelimiter;
}
public boolean isHiveOverWrite() {
return hiveOverWrite;
}
public void setHiveOverWrite(boolean hiveOverWrite) {
this.hiveOverWrite = hiveOverWrite;
}
public String getReplaceDelimiter() {
return replaceDelimiter;
}
public void setReplaceDelimiter(String replaceDelimiter) {
this.replaceDelimiter = replaceDelimiter;
}
public String getHivePartitionKey() {
return hivePartitionKey;
}
public void setHivePartitionKey(String hivePartitionKey) {
this.hivePartitionKey = hivePartitionKey;
}
public String getHivePartitionValue() {
return hivePartitionValue;
}
public void setHivePartitionValue(String hivePartitionValue) {
this.hivePartitionValue = hivePartitionValue;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.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.CMDPARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_EMPTY_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_FATHER_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
import static java.util.stream.Collectors.toSet; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.Direct;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.DateInterval;
import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.process.ProcessDag;
import org.apache.dolphinscheduler.common.process.Property;
import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters;
import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter;
import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.DagData; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.ErrorCommand;
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.ProcessTaskRelation;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
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.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
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.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.utils.DagHelper;
import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand;
import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.log.LogClientService;
import org.apache.dolphinscheduler.service.quartz.cron.CronUtils;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Lists;
/**
* process relative dao that some mappers in this.
*/
@Component
public class ProcessService {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.DELAY_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
@Autowired
private UserMapper userMapper;
@Autowired
private ProcessDefinitionMapper processDefineMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | @Autowired
private ProcessDefinitionLogMapper processDefineLogMapper;
@Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper;
@Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | @Autowired
private ProcessTaskRelationMapper processTaskRelationMapper;
@Autowired
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
StateEventCallbackService stateEventCallbackService;
@Autowired
private EnvironmentMapper environmentMapper;
@Autowired
private TaskGroupQueueMapper taskGroupQueueMapper;
@Autowired
private TaskGroupMapper taskGroupMapper;
/**
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param logger logger
* @param host host
* @param command found command
* @return process instance
*/
@Transactional
public ProcessInstance handleCommand(Logger logger, String host, Command command) {
ProcessInstance processInstance = constructProcessInstance(command, host);
if (processInstance == null) {
logger.error("scan command, command parameter is error: {}", command);
moveToErrorCommand(command, "process instance is null");
return null;
}
processInstance.setCommandType(command.getCommandType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.addHistoryCmd(command.getCommandType());
ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
if (processDefinition.getExecutionType().typeIsSerial()) {
saveSerialProcess(processInstance, processDefinition);
if (processInstance.getState() != ExecutionStatus.SUBMITTED_SUCCESS) {
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return null;
}
} else {
saveProcessInstance(processInstance);
}
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return processInstance;
}
private void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) {
processInstance.setState(ExecutionStatus.SERIAL_WAIT);
saveProcessInstance(processInstance);
if (processDefinition.getExecutionType().typeIsSerialWait()) {
while (true) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
saveProcessInstance(processInstance);
return; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
ProcessInstance runningProcess = runningProcessInstances.get(0);
if (this.processInstanceMapper.updateNextProcessIdById(processInstance.getId(), runningProcess.getId())) {
return;
}
}
} else if (processDefinition.getExecutionType().typeIsSerialDiscard()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setState(ExecutionStatus.STOP);
saveProcessInstance(processInstance);
}
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
for (ProcessInstance info : runningProcessInstances) {
info.setCommandType(CommandType.STOP);
info.addHistoryCmd(CommandType.STOP);
info.setState(ExecutionStatus.READY_STOP);
int update = updateProcessInstance(info);
if (update > 0) {
String host = info.getHost();
String address = host.split(":")[0];
int port = Integer.parseInt(host.split(":")[1]);
StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0
); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | try {
stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
} catch (Exception e) {
logger.error("sendResultError");
}
}
}
}
}
}
/**
* save error command, and delete original command
*
* @param command command
* @param message message
*/
public void moveToErrorCommand(Command command, String message) {
ErrorCommand errorCommand = new ErrorCommand(command, message);
this.errorCommandMapper.insert(errorCommand);
this.commandMapper.deleteById(command.getId());
}
/**
* set process waiting thread
*
* @param command command
* @param processInstance processInstance
* @return process instance
*/
private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
processInstance.setState(ExecutionStatus.WAITING_THREAD); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) {
processInstance.addHistoryCmd(command.getCommandType());
}
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
createRecoveryWaitingThreadCommand(command, processInstance);
return null;
}
/**
* insert one command
*
* @param command command
* @return create result
*/
public int createCommand(Command command) {
int result = 0;
if (command != null) {
result = commandMapper.insert(command);
}
return result;
}
/**
* get command page
*/
public List<Command> findCommandPage(int pageSize, int pageNumber) {
return commandMapper.queryCommandPage(pageSize, pageNumber * pageSize);
}
/**
* check the input command exists in queue list
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param command command
* @return create command result
*/
public boolean verifyIsNeedCreateCommand(Command command) {
boolean isNeedCreate = true;
EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class);
cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1);
cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1);
cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1);
CommandType commandType = command.getCommandType();
if (cmdTypeMap.containsKey(commandType)) {
ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam());
int processInstanceId = cmdParamObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt();
List<Command> commands = commandMapper.selectList(null);
for (Command tmpCommand : commands) {
if (cmdTypeMap.containsKey(tmpCommand.getCommandType())) {
ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam());
if (tempObj != null && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) {
isNeedCreate = false;
break;
}
}
}
}
return isNeedCreate;
}
/**
* find process instance detail by id
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param processId processId
* @return process instance
*/
public ProcessInstance findProcessInstanceDetailById(int processId) {
return processInstanceMapper.queryDetailById(processId);
}
/**
* get task node list by definitionId
*/
public List<TaskDefinition> getTaskNodeListByDefinition(long defineCode) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(defineCode);
if (processDefinition == null) {
logger.error("process define not exists");
return Lists.newArrayList();
}
List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
if (taskDefinitionSet.isEmpty()) {
return Lists.newArrayList();
}
List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
return Lists.newArrayList(taskDefinitionLogs);
}
/**
* find process instance by id |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param processId processId
* @return process instance
*/
public ProcessInstance findProcessInstanceById(int processId) {
return processInstanceMapper.selectById(processId);
}
/**
* find process define by id.
*
* @param processDefinitionId processDefinitionId
* @return process definition
*/
public ProcessDefinition findProcessDefineById(int processDefinitionId) {
return processDefineMapper.selectById(processDefinitionId);
}
/**
* find process define by code and version.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || processDefinition.getVersion() != version) {
processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version);
if (processDefinition != null) {
processDefinition.setId(0);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return processDefinition;
}
/**
* find process define by code.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) {
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* delete work process instance by id
*
* @param processInstanceId processInstanceId
* @return delete process instance result
*/
public int deleteWorkProcessInstanceById(int processInstanceId) {
return processInstanceMapper.deleteById(processInstanceId);
}
/**
* delete all sub process by parent instance id
*
* @param processInstanceId processInstanceId
* @return delete all sub process instance result
*/
public int deleteAllSubWorkProcessByParentId(int processInstanceId) {
List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId);
for (Integer subId : subProcessIdList) {
deleteAllSubWorkProcessByParentId(subId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | deleteWorkProcessMapByParentId(subId);
removeTaskLogFile(subId);
deleteWorkProcessInstanceById(subId);
}
return 1;
}
/**
* remove task log file
*
* @param processInstanceId processInstanceId
*/
public void removeTaskLogFile(Integer processInstanceId) {
List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId);
if (CollectionUtils.isEmpty(taskInstanceList)) {
return;
}
try (LogClientService logClient = new LogClientService()) {
for (TaskInstance taskInstance : taskInstanceList) {
String taskLogPath = taskInstance.getLogPath();
if (StringUtils.isEmpty(taskInstance.getHost())) {
continue;
}
Host host = Host.of(taskInstance.getHost());
logClient.removeTaskLog(host.getIp(), host.getPort(), taskLogPath);
}
}
}
/**
* recursive query sub process definition id by parent id. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param parentCode parentCode
* @param ids ids
*/
public void recurseFindSubProcess(long parentCode, List<Long> ids) {
List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinition(parentCode);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionCode());
recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids);
}
}
}
}
/**
* create recovery waiting thread command when thread pool is not enough for the process instance.
* sub work process instance need not to create recovery command.
* create recovery waiting thread command and delete origin command at the same time.
* if the recovery command is exists, only update the field update_time
*
* @param originCommand originCommand
* @param processInstance processInstance
*/
public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
if (processInstance.getIsSubProcess() == Flag.YES) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (originCommand != null) {
commandMapper.deleteById(originCommand.getId());
}
return;
}
Map<String, String> cmdParam = new HashMap<>();
cmdParam.put(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD, String.valueOf(processInstance.getId()));
if (originCommand == null) {
Command command = new Command(
CommandType.RECOVER_WAITING_THREAD,
processInstance.getTaskDependType(),
processInstance.getFailureStrategy(),
processInstance.getExecutorId(),
processInstance.getProcessDefinition().getCode(),
JSONUtils.toJsonString(cmdParam),
processInstance.getWarningType(),
processInstance.getWarningGroupId(),
processInstance.getScheduleTime(),
processInstance.getWorkerGroup(),
processInstance.getEnvironmentCode(),
processInstance.getProcessInstancePriority(),
processInstance.getDryRun(),
processInstance.getId(),
processInstance.getProcessDefinitionVersion()
);
saveCommand(command);
return;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) {
originCommand.setUpdateTime(new Date());
saveCommand(originCommand);
} else {
commandMapper.deleteById(originCommand.getId());
originCommand.setId(0);
originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
originCommand.setUpdateTime(new Date());
originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam));
originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority());
saveCommand(originCommand);
}
}
/**
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map
* @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null
&& cmdParam != null
&& cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> schedules = queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (complementDateList.size() > 0) {
scheduleTime = complementDateList.get(0);
} else {
logger.error("set scheduler time error: complement date list is empty, command: {}",
command.toString());
}
}
return scheduleTime;
}
/**
* generate a new work process instance from command.
*
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command,
Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
processInstance.setWarningGroupId(warningGroupId);
processInstance.setDryRun(command.getDryRun());
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setCommandStartTime(command.getStartTime());
processInstance.setLocations(processDefinition.getLocations());
setGlobalParamIfCommanded(processDefinition, cmdParam);
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
getCommandTypeIfComplement(processInstance, command),
processInstance.getScheduleTime()));
processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup();
processInstance.setWorkerGroup(workerGroup);
processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode());
processInstance.setTimeout(processDefinition.getTimeout());
processInstance.setTenantId(processDefinition.getTenantId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return processInstance;
}
private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
Map<String, String> startParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) {
String startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtils.toMap(startParamJson);
}
Map<String, String> fatherParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_FATHER_PARAMS)) {
String fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtils.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
if (startParamMap.size() > 0
&& processDefinition.getGlobalParamMap() != null) {
for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) {
String val = startParamMap.get(param.getKey());
if (val != null) {
param.setValue(val);
}
}
}
}
/**
* get process tenant
* there is tenant id in definition, use the tenant of the definition.
* if there is not tenant id in the definiton or the tenant not exist |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * use definition creator's tenant.
*
* @param tenantId tenantId
* @param userId userId
* @return tenant
*/
public Tenant getTenantForProcess(int tenantId, int userId) {
Tenant tenant = null;
if (tenantId >= 0) {
tenant = tenantMapper.queryById(tenantId);
}
if (userId == 0) {
return null;
}
if (tenant == null) {
User user = userMapper.selectById(userId);
tenant = tenantMapper.queryById(user.getTenantId());
}
return tenant;
}
/**
* get an environment
* use the code of the environment to find a environment.
*
* @param environmentCode environmentCode
* @return Environment
*/
public Environment findEnvironmentByCode(Long environmentCode) {
Environment environment = null;
if (environmentCode >= 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | environment = environmentMapper.queryByEnvironmentCode(environmentCode);
}
return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid
*/
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES)
|| cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) {
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
return true;
}
/**
* construct process instance according to one command.
*
* @param command command
* @param host host
* @return process instance
*/
private ProcessInstance constructProcessInstance(Command command, String host) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | ProcessInstance processInstance;
ProcessDefinition processDefinition;
CommandType commandType = command.getCommandType();
processDefinition = this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinition == null) {
logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode());
return null;
}
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
int processInstanceId = command.getProcessInstanceId();
if (processInstanceId == 0) {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
} else {
processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return processInstance;
}
}
if (cmdParam != null) {
CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) {
setGlobalParamIfCommanded(processDefinition, cmdParam);
}
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
commandTypeIfComplement,
processInstance.getScheduleTime())); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setProcessDefinition(processDefinition);
}
if (processInstance.getCommandParam() != null) {
Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam());
for (Map.Entry<String, String> entry : processCmdParam.entrySet()) {
if (!cmdParam.containsKey(entry.getKey())) {
cmdParam.put(entry.getKey(), entry.getValue());
}
}
}
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstance.setCommandParam(command.getCommandParam());
}
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
logger.error("command parameter check failed!");
return null;
}
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setHost(host);
processInstance.setRestartTime(new Date());
ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType) {
case START_PROCESS:
break;
case START_FAILURE_TASK_PROCESS: |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE);
List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE);
List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL);
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
failedList.addAll(killedList);
failedList.addAll(toleranceList);
for (Integer taskId : failedList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(failedList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case START_CURRENT_TASK_PROCESS:
break;
case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE);
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
ExecutionStatus.KILL);
suspendedNodeList.addAll(stopNodeList);
for (Integer taskId : suspendedNodeList) {
initTaskInstance(this.findTaskInstanceById(taskId));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
processInstance.setRecovery(Flag.YES);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA:
if (processInstance.getId() != 0) {
List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : taskInstanceList) {
taskInstance.setFlag(Flag.NO);
this.updateTaskInstance(taskInstance);
}
}
break;
case REPEAT_RUNNING:
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
}
List<TaskInstance> validTaskList = findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : validTaskList) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
processInstance.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
default:
break;
}
processInstance.setState(runStatus);
return processInstance;
}
/**
* get process definition by command
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance
* Otherwise, get the latest version of ProcessDefinition
*
* @return ProcessDefinition
*/
private ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode, Map<String, String> cmdParam) {
if (cmdParam != null) {
int processInstanceId = 0;
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD));
}
if (processInstanceId != 0) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return null;
}
return processDefineLogMapper.queryByDefinitionCodeAndVersion(
processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
}
}
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* return complement data if the process start with complement data
*
* @param processInstance processInstance
* @param command command
* @return command type
*/
private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) {
return CommandType.COMPLEMENT_DATA;
} else {
return command.getCommandType();
}
}
/**
* initialize complement data parameters
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param processDefinition processDefinition
* @param processInstance processInstance
* @param cmdParam cmdParam
*/
private void initComplementDataParam(ProcessDefinition processDefinition,
ProcessInstance processInstance,
Map<String, String> cmdParam) {
if (!processInstance.isComplementData()) {
return;
}
Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> listSchedules = queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode());
List<Date> complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules);
if (complementDate.size() > 0
&& Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(complementDate.get(0));
}
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
}
/**
* set sub work process parameters.
* handle sub work process instance, update relation table and command parameters
* set sub work process flag, extends parent work process command parameters
*
* @param subProcessInstance subProcessInstance
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public void setSubProcessParam(ProcessInstance subProcessInstance) {
String cmdParam = subProcessInstance.getCommandParam();
if (StringUtils.isEmpty(cmdParam)) {
return;
}
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
paramMap.remove(CMD_PARAM_SUB_PROCESS);
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
subProcessInstance.setIsSubProcess(Flag.YES);
this.saveProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (StringUtils.isNotEmpty(parentInstanceId)) {
ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
this.saveProcessInstance(subProcessInstance);
} else {
logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
}
}
ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class);
if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) {
return; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
this.updateWorkProcessInstanceMap(processInstanceMap);
}
/**
* join parent global params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentGlobalParams parentGlobalParams
* @param subGlobalParams subGlobalParams
* @return global params join
*/
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class);
List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class);
Map<String, String> subMap = subPropertyList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
for (Property parent : parentPropertyList) {
if (!subMap.containsKey(parent.getProp())) {
subPropertyList.add(parent);
}
}
return JSONUtils.toJsonString(subPropertyList);
}
/**
* initialize task instance
*
* @param taskInstance taskInstance
*/
private void initTaskInstance(TaskInstance taskInstance) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (!taskInstance.isSubProcess()
&& (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
return;
}
taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
updateTaskInstance(taskInstance);
}
/**
* retry submit task to db
*/
public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, int commitInterval) {
int retryTimes = 1;
TaskInstance task = null;
while (retryTimes <= commitRetryTimes) {
try {
task = SpringApplicationContext.getBean(ProcessService.class).submitTask(processInstance, taskInstance);
if (task != null && task.getId() != 0) {
break;
}
logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes);
Thread.sleep(commitInterval);
} catch (Exception e) {
logger.error("task commit to mysql failed", e);
}
retryTimes += 1;
}
return task; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* submit task to db
* submit sub process to command
*
* @param processInstance processInstance
* @param taskInstance taskInstance
* @return task instance
*/
@Transactional(rollbackFor = Exception.class)
public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) {
logger.info("start submit task : {}, instance id:{}, state: {}",
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
if (task == null) {
logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
return null;
}
if (!task.getState().typeIsFinished()) {
createSubWorkProcess(processInstance, task);
}
logger.info("end submit task to db successfully:{} {} state:{} complete, instance id:{} state: {} ",
taskInstance.getId(), taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
return task;
}
/**
* set work process instance map
* consider o |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * repeat running does not generate new sub process instance
* set map {parent instance id, task instance id, 0(child instance id)}
*
* @param parentInstance parentInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) {
ProcessInstanceMap processMap = findWorkProcessMapByParent(parentInstance.getId(), parentTask.getId());
if (processMap != null) {
return processMap;
}
if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
processMap = findPreviousTaskProcessMap(parentInstance, parentTask);
if (processMap != null) {
processMap.setParentTaskInstanceId(parentTask.getId());
updateWorkProcessInstanceMap(processMap);
return processMap;
}
}
processMap = new ProcessInstanceMap();
processMap.setParentProcessInstanceId(parentInstance.getId());
processMap.setParentTaskInstanceId(parentTask.getId());
createWorkProcessInstanceMap(processMap);
return processMap;
}
/**
* find previous task work process map. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param parentProcessInstance parentProcessInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
TaskInstance parentTask) {
Integer preTaskId = 0;
List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId());
for (TaskInstance task : preTaskList) {
if (task.getName().equals(parentTask.getName())) {
preTaskId = task.getId();
ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId);
if (map != null) {
return map;
}
}
}
logger.info("sub process instance is not found,parent task:{},parent instance:{}",
parentTask.getId(), parentProcessInstance.getId());
return null;
}
/**
* create sub work process command
*
* @param parentProcessInstance parentProcessInstance
* @param task task
*/
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) {
if (!task.isSubProcess()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return;
}
ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId());
if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) {
return;
}
instanceMap = setProcessInstanceMap(parentProcessInstance, task);
ProcessInstance childInstance = null;
if (instanceMap.getProcessInstanceId() != 0) {
childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId());
}
Command subProcessCommand = createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task);
updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode());
initSubInstanceState(childInstance);
createCommand(subProcessCommand);
logger.info("sub process command created: {} ", subProcessCommand);
}
/**
* complement data needs transform parent parameter to child.
*/
private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map<String, String> fatherParams) {
String processMapStr = JSONUtils.toJsonString(instanceMap);
Map<String, String> cmdParam = JSONUtils.toMap(processMapStr);
if (parentProcessInstance.isComplementData()) {
Map<String, String> parentParam = JSONUtils.toMap(parentProcessInstance.getCommandParam());
String endTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE);
String startTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endTime);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime);
processMapStr = JSONUtils.toJsonString(cmdParam);
}
if (fatherParams.size() != 0) {
cmdParam.put(CMD_PARAM_FATHER_PARAMS, JSONUtils.toJsonString(fatherParams));
processMapStr = JSONUtils.toJsonString(cmdParam);
}
return processMapStr;
}
public Map<String, String> getGlobalParamMap(String globalParams) {
List<Property> propList;
Map<String, String> globalParamMap = new HashMap<>();
if (StringUtils.isNotEmpty(globalParams)) {
propList = JSONUtils.toList(globalParams, Property.class);
globalParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
}
return globalParamMap;
}
/**
* create sub work process command
*/
public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
ProcessInstance childInstance,
ProcessInstanceMap instanceMap,
TaskInstance task) {
CommandType commandType = getSubCommandType(parentProcessInstance, childInstance);
Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams());
long childDefineCode = 0L;
if (subProcessParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | childDefineCode = Long.parseLong(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE));
}
ProcessDefinition subProcessDefinition = processDefineMapper.queryByCode(childDefineCode);
Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS);
List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
Map<String, String> globalMap = this.getGlobalParamMap(parentProcessInstance.getGlobalParams());
Map<String, String> fatherParams = new HashMap<>();
if (CollectionUtils.isNotEmpty(allParam)) {
for (Property info : allParam) {
fatherParams.put(info.getProp(), globalMap.get(info.getProp()));
}
}
String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams);
int subProcessInstanceId = childInstance == null ? 0 : childInstance.getId();
return new Command(
commandType,
TaskDependType.TASK_POST,
parentProcessInstance.getFailureStrategy(),
parentProcessInstance.getExecutorId(),
subProcessDefinition.getCode(),
processParam,
parentProcessInstance.getWarningType(),
parentProcessInstance.getWarningGroupId(),
parentProcessInstance.getScheduleTime(),
task.getWorkerGroup(),
task.getEnvironmentCode(),
parentProcessInstance.getProcessInstancePriority(),
parentProcessInstance.getDryRun(),
subProcessInstanceId,
subProcessDefinition.getVersion() |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | );
}
/**
* initialize sub work flow state
* child instance state would be initialized when 'recovery from pause/stop/failure'
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
childInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
updateProcessInstance(childInstance);
}
}
/**
* get sub work flow command type
* child instance exist: child command = fatherCommand
* child instance not exists: child command = fatherCommand[0]
*/
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
CommandType commandType = parentProcessInstance.getCommandType();
if (childInstance == null) {
String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]);
}
return commandType;
}
/**
* update sub process definition
*
* @param parentProcessInstance parentProcessInstance
* @param childDefinitionCode childDefinitionId |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and sub process | ### 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 the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### 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/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) {
ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(),
parentProcessInstance.getProcessDefinitionVersion());
ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode);
if (childDefinition != null && fatherDefinition != null) {
childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId());
processDefineMapper.updateById(childDefinition);
}
}
/**
* submit task to mysql
*
* @param taskInstance taskInstance
* @param processInstance processInstance
* @return task instance
*/
public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) {
ExecutionStatus processInstanceState = processInstance.getState();
if (taskInstance.getState().typeIsFailure()) {
if (taskInstance.isSubProcess()) {
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
} else {
if (processInstanceState != ExecutionStatus.READY_STOP
&& processInstanceState != ExecutionStatus.READY_PAUSE) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE) { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.