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
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
return true;
}
return ths.dependFaledTaskSet.sze() > 0;
}
/**
* process nstance falure
*
* @return Boolean whether process nstance faled
*/
prvate boolean processFaled() {
f (hasFaledTask()) {
logger.nfo("The current process has faled task, the current process faled");
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
return true;
}
f (processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) {
return readyToSubmtTaskQueue.sze() == 0 && actveTaskProcessorMaps.sze() == 0
&& watToRetryTaskInstanceMap.sze() == 0;
}
}
return false;
}
/**
* prepare for pause
* 1,faled retry task n the preparaton queue , returns to falure drectly
* 2,exsts pause task,complement not completed, pendng submsson of tasks, return to suspenson
* 3,success
*
* @return ExecutonStatus
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
prvate WorkflowExecutonStatus processReadyPause() {
f (hasRetryTaskInStandBy()) {
return WorkflowExecutonStatus.FAILURE;
}
Lst<TaskInstance> pauseLst = getCompleteTaskByState(TaskExecutonStatus.PAUSE);
f (CollectonUtls.sNotEmpty(pauseLst) || processInstance.sBlocked() || !sComplementEnd()
|| readyToSubmtTaskQueue.sze() > 0) {
return WorkflowExecutonStatus.PAUSE;
} else {
return WorkflowExecutonStatus.SUCCESS;
}
}
/**
* prepare for block
* f process has tasks stll runnng, pause them
* f readyToSubmtTaskQueue s not empty, kll them
* else return block status drectly
*
* @return ExecutonStatus
*/
prvate WorkflowExecutonStatus processReadyBlock() {
f (actveTaskProcessorMaps.sze() > 0) {
for (ITaskProcessor taskProcessor : actveTaskProcessorMaps.values()) {
f (!TASK_TYPE_BLOCKING.equals(taskProcessor.getType())) {
taskProcessor.acton(TaskActon.PAUSE);
}
}
}
f (readyToSubmtTaskQueue.sze() > 0) {
for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext();) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
ter.next().setState(TaskExecutonStatus.PAUSE);
}
}
return WorkflowExecutonStatus.BLOCK;
}
/**
* generate the latest process nstance status by the tasks state
*
* @return process nstance executon status
*/
prvate WorkflowExecutonStatus getProcessInstanceState(ProcessInstance nstance) {
WorkflowExecutonStatus state = nstance.getState();
f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) {
// actve
WorkflowExecutonStatus executonStatus = runnngState(state);
logger.nfo("The workflowInstance has task runnng, the workflowInstance status s {}", executonStatus);
return executonStatus;
}
// block
f (state == WorkflowExecutonStatus.READY_BLOCK) {
WorkflowExecutonStatus executonStatus = processReadyBlock();
logger.nfo("The workflowInstance s ready to block, the workflowInstance status s {}", executonStatus);
return executonStatus;
}
// pause
f (state == WorkflowExecutonStatus.READY_PAUSE) {
WorkflowExecutonStatus executonStatus = processReadyPause();
logger.nfo("The workflowInstance s ready to pause, the workflow status s {}", executonStatus);
return executonStatus;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
// stop
f (state == WorkflowExecutonStatus.READY_STOP) {
Lst<TaskInstance> kllLst = getCompleteTaskByState(TaskExecutonStatus.KILL);
Lst<TaskInstance> falLst = getCompleteTaskByState(TaskExecutonStatus.FAILURE);
WorkflowExecutonStatus executonStatus;
f (CollectonUtls.sNotEmpty(kllLst) || CollectonUtls.sNotEmpty(falLst) || !sComplementEnd()) {
executonStatus = WorkflowExecutonStatus.STOP;
} else {
executonStatus = WorkflowExecutonStatus.SUCCESS;
}
logger.nfo("The workflowInstance s ready to stop, the workflow status s {}", executonStatus);
return executonStatus;
}
// process falure
f (processFaled()) {
logger.nfo("The workflowInstance s faled, the workflow status s {}", WorkflowExecutonStatus.FAILURE);
return WorkflowExecutonStatus.FAILURE;
}
// success
f (state == WorkflowExecutonStatus.RUNNING_EXECUTION) {
Lst<TaskInstance> kllTasks = getCompleteTaskByState(TaskExecutonStatus.KILL);
f (readyToSubmtTaskQueue.sze() > 0 || watToRetryTaskInstanceMap.sze() > 0) {
// tasks c
return WorkflowExecutonStatus.RUNNING_EXECUTION;
} else f (CollectonUtls.sNotEmpty(kllTasks)) {
// tasks m
return WorkflowExecutonStatus.FAILURE;
} else {
// f the
return WorkflowExecutonStatus.SUCCESS;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
}
return state;
}
/**
* whether complement end
*
* @return Boolean whether s complement end
*/
prvate boolean sComplementEnd() {
f (!processInstance.sComplementData()) {
return true;
}
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
Date endTme = DateUtls.strngToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
return processInstance.getScheduleTme().equals(endTme);
}
/**
* updateProcessInstance process nstance state
* after each batch of tasks s executed, of the process nstance s updated
*/
prvate vod updateProcessInstanceState() throws StateEventHandleExcepton {
WorkflowExecutonStatus state = getProcessInstanceState(processInstance);
f (processInstance.getState() != state) {
logger.nfo("Update workflowInstance states, orgn state: {}, target state: {}",
processInstance.getState(),
state);
updateWorkflowInstanceStatesToDB(state);
WorkflowStateEvent stateEvent = WorkflowStateEvent.bulder()
.processInstanceId(processInstance.getId())
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
.status(processInstance.getState())
.type(StateEventType.PROCESS_STATE_CHANGE)
.buld();
// replace
ths.stateEvents.add(stateEvent);
} else {
logger.nfo("There s no need to update the workflow nstance state, orgn state: {}, target state: {}",
processInstance.getState(),
state);
}
}
/**
* stateEvent's executon status as process nstance state
*/
publc vod updateProcessInstanceState(WorkflowStateEvent stateEvent) throws StateEventHandleExcepton {
WorkflowExecutonStatus state = stateEvent.getStatus();
updateWorkflowInstanceStatesToDB(state);
}
prvate vod updateWorkflowInstanceStatesToDB(WorkflowExecutonStatus newStates) throws StateEventHandleExcepton {
WorkflowExecutonStatus orgnStates = processInstance.getState();
f (orgnStates != newStates) {
logger.nfo("Begn to update workflow nstance state , state wll change from {} to {}",
orgnStates,
newStates);
processInstance.setStateWthDesc(newStates, "update by workflow executor");
f (newStates.sFnshed()) {
processInstance.setEndTme(new Date());
}
try {
processInstanceDao.updateProcessInstance(processInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
} catch (Excepton ex) {
// recover
processInstance.setStateWthDesc(orgnStates, "recover state by DB error");
processInstance.setEndTme(null);
throw new StateEventHandleExcepton("Update process nstance status to DB error", ex);
}
}
}
/**
* get task dependency result
*
* @param taskInstance task nstance
* @return DependResult
*/
prvate DependResult getDependResultForTask(TaskInstance taskInstance) {
return sTaskDepsComplete(Long.toStrng(taskInstance.getTaskCode()));
}
/**
* add task to standby lst
*
* @param taskInstance task nstance
*/
publc vod addTaskToStandByLst(TaskInstance taskInstance) {
f (readyToSubmtTaskQueue.contans(taskInstance)) {
logger.warn("Task already exsts n ready submt queue, no need to add agan, task code:{}",
taskInstance.getTaskCode());
return;
}
logger.nfo("Add task to stand by lst, task name:{}, task d:{}, task code:{}",
taskInstance.getName(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskInstance.getId(),
taskInstance.getTaskCode());
TaskMetrcs.ncTaskInstanceByState("submt");
readyToSubmtTaskQueue.put(taskInstance);
}
/**
* remove task from stand by lst
*
* @param taskInstance task nstance
*/
prvate boolean removeTaskFromStandbyLst(TaskInstance taskInstance) {
return readyToSubmtTaskQueue.remove(taskInstance);
}
/**
* has retry task n standby
*
* @return Boolean whether has retry task n standby
*/
prvate boolean hasRetryTaskInStandBy() {
for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext();) {
f (ter.next().getState().sFalure()) {
return true;
}
}
return false;
}
/**
* close the on gong tasks
*/
publc vod kllAllTasks() {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo("kll called on process nstance d: {}, num: {}",
processInstance.getId(),
actveTaskProcessorMaps.sze());
f (readyToSubmtTaskQueue.sze() > 0) {
readyToSubmtTaskQueue.clear();
}
for (long taskCode : actveTaskProcessorMaps.keySet()) {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode);
Integer taskInstanceId = valdTaskMap.get(taskCode);
f (taskInstanceId == null || taskInstanceId.equals(0)) {
contnue;
}
TaskInstance taskInstance = taskInstanceDao.fndTaskInstanceById(taskInstanceId);
f (taskInstance == null || taskInstance.getState().sFnshed()) {
contnue;
}
taskProcessor.acton(TaskActon.STOP);
f (taskProcessor.taskInstance().getState().sFnshed()) {
TaskStateEvent taskStateEvent = TaskStateEvent.bulder()
.processInstanceId(processInstance.getId())
.taskInstanceId(taskInstance.getId())
.status(taskProcessor.taskInstance().getState())
.type(StateEventType.TASK_STATE_CHANGE)
.buld();
ths.addStateEvent(taskStateEvent);
}
}
}
publc boolean workFlowFnsh() {
return ths.processInstance.getState().sFnshed();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* handlng the lst of tasks to be submtted
*/
publc vod submtStandByTask() throws StateEventHandleExcepton {
nt length = readyToSubmtTaskQueue.sze();
for (nt = 0; < length; ++) {
TaskInstance task = readyToSubmtTaskQueue.peek();
f (task == null) {
contnue;
}
// stop ta
f (task.taskCanRetry()) {
TaskInstance retryTask = taskInstanceDao.fndTaskInstanceById(task.getId());
f (retryTask != null && retryTask.getState().sForceSuccess()) {
task.setState(retryTask.getState());
logger.nfo(
"Task {} has been forced success, put t nto complete task lst and stop retryng, taskInstanceId: {}",
task.getName(), task.getId());
removeTaskFromStandbyLst(task);
completeTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
submtPostNode(Long.toStrng(task.getTaskCode()));
contnue;
}
}
// nt va
f (task.sFrstRun()) {
// get pre
Set<Strng> preTask = dag.getPrevousNodes(Long.toStrng(task.getTaskCode()));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
getPreVarPool(task, preTask);
}
DependResult dependResult = getDependResultForTask(task);
f (DependResult.SUCCESS == dependResult) {
logger.nfo("The dependResult of task {} s success, so ready to submt to execute", task.getName());
Optonal<TaskInstance> taskInstanceOptonal = submtTaskExec(task);
f (!taskInstanceOptonal.sPresent()) {
ths.taskFaledSubmt = true;
// Remove
f (!removeTaskFromStandbyLst(task)) {
logger.error(
"Task submt faled, remove from standby lst faled, workflowInstanceId: {}, taskCode: {}",
processInstance.getId(),
task.getTaskCode());
}
completeTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
errorTaskMap.put(task.getTaskCode(), task.getId());
actveTaskProcessorMaps.remove(task.getTaskCode());
logger.error("Task submtted faled, workflowInstanceId: {}, taskInstanceId: {}, taskCode: {}",
task.getProcessInstanceId(),
task.getId(),
task.getTaskCode());
} else {
removeTaskFromStandbyLst(task);
}
} else f (DependResult.FAILED == dependResult) {
// f the
dependFaledTaskSet.add(task.getTaskCode());
removeTaskFromStandbyLst(task);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo("Task dependent result s faled, taskInstanceId:{} depend result : {}", task.getId(),
dependResult);
} else f (DependResult.NON_EXEC == dependResult) {
// for som
removeTaskFromStandbyLst(task);
logger.nfo("Remove task due to depend result not executed, taskInstanceId:{} depend result : {}",
task.getId(), dependResult);
}
}
}
/**
* Get start task nstance lst from recover
*
* @param cmdParam command param
* @return task nstance lst
*/
protected Lst<TaskInstance> getRecoverTaskInstanceLst(Strng cmdParam) {
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
// todo: Can we use a better way to set the recover taskInstanceId lst? rather then use the cmdParam
f (paramMap != null && paramMap.contansKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) {
Lst<Integer> startTaskInstanceIds = Arrays.stream(paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING)
.splt(COMMA))
.flter(StrngUtls::sNotEmpty)
.map(Integer::valueOf)
.collect(Collectors.toLst());
f (CollectonUtls.sNotEmpty(startTaskInstanceIds)) {
return taskInstanceDao.fndTaskInstanceByIdLst(startTaskInstanceIds);
}
}
return Collectons.emptyLst();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* parse "StartNodeNameLst" from cmd param
*
* @param cmdParam command param
* @return start node name lst
*/
prvate Lst<Strng> parseStartNodeName(Strng cmdParam) {
Lst<Strng> startNodeNameLst = new ArrayLst<>();
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
f (paramMap == null) {
return startNodeNameLst;
}
f (paramMap.contansKey(CMD_PARAM_START_NODES)) {
startNodeNameLst = Arrays.asLst(paramMap.get(CMD_PARAM_START_NODES).splt(Constants.COMMA));
}
return startNodeNameLst;
}
/**
* generate start node code lst from parsng command param;
* f "StartNodeIdLst" exsts n command param, return StartNodeIdLst
*
* @return recovery node code lst
*/
prvate Lst<Strng> getRecoveryNodeCodeLst(Lst<TaskInstance> recoverNodeLst) {
Lst<Strng> recoveryNodeCodeLst = new ArrayLst<>();
f (CollectonUtls.sNotEmpty(recoverNodeLst)) {
for (TaskInstance task : recoverNodeLst) {
recoveryNodeCodeLst.add(Long.toStrng(task.getTaskCode()));
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
return recoveryNodeCodeLst;
}
/**
* generate flow dag
*
* @param totalTaskNodeLst total task node lst
* @param startNodeNameLst start node name lst
* @param recoveryNodeCodeLst recovery node code lst
* @param depNodeType depend node type
* @return ProcessDag process dag
* @throws Excepton excepton
*/
publc ProcessDag generateFlowDag(Lst<TaskNode> totalTaskNodeLst,
Lst<Strng> startNodeNameLst,
Lst<Strng> recoveryNodeCodeLst,
TaskDependType depNodeType) throws Excepton {
return DagHelper.generateFlowDag(totalTaskNodeLst, startNodeNameLst, recoveryNodeCodeLst, depNodeType);
}
/**
* check task queue
*/
prvate boolean checkTaskQueue() {
AtomcBoolean result = new AtomcBoolean(false);
taskInstanceMap.forEach((d, taskInstance) -> {
f (taskInstance != null && taskInstance.getTaskGroupId() > 0) {
result.set(true);
}
});
return result.get();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* s new process nstance
*/
prvate boolean sNewProcessInstance() {
f (Flag.YES.equals(processInstance.getRecovery())) {
logger.nfo("Ths workInstance wll be recover by ths executon");
return false;
}
f (WorkflowExecutonStatus.RUNNING_EXECUTION == processInstance.getState()
&& processInstance.getRunTmes() == 1) {
return true;
}
logger.nfo(
"The workflowInstance has been executed before, ths executon s to reRun, processInstance status: {}, runTmes: {}",
processInstance.getState(),
processInstance.getRunTmes());
return false;
}
publc vod resubmt(long taskCode) throws Excepton {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode);
f (taskProcessor != null) {
taskProcessor.acton(TaskActon.RESUBMIT);
logger.debug("RESUBMIT: task code:{}", taskCode);
} else {
throw new Excepton("resubmt error, taskProcessor s null, task code: " + taskCode);
}
}
publc Map<Long, Integer> getCompleteTaskMap() {
return completeTaskMap;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
publc Map<Long, ITaskProcessor> getActveTaskProcessMap() {
return actveTaskProcessorMaps;
}
publc Map<Long, TaskInstance> getWatToRetryTaskInstanceMap() {
return watToRetryTaskInstanceMap;
}
prvate vod setGlobalParamIfCommanded(ProcessDefnton processDefnton, Map<Strng, Strng> cmdParam) {
// get start params from command param
Map<Strng, Strng> startParamMap = new HashMap<>();
f (cmdParam.contansKey(CMD_PARAM_START_PARAMS)) {
Strng startParamJson = cmdParam.get(CMD_PARAM_START_PARAMS);
startParamMap = JSONUtls.toMap(startParamJson);
}
Map<Strng, Strng> fatherParamMap = new HashMap<>();
f (cmdParam.contansKey(CMD_PARAM_FATHER_PARAMS)) {
Strng fatherParamJson = cmdParam.get(CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtls.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
// set start param nto global params
Map<Strng, Strng> globalMap = processDefnton.getGlobalParamMap();
Lst<Property> globalParamLst = processDefnton.getGlobalParamLst();
f (startParamMap.sze() > 0 && globalMap != null) {
// start p
for (Map.Entry<Strng, Strng> param : globalMap.entrySet()) {
Strng val = startParamMap.get(param.getKey());
f (val != null) {
param.setValue(val);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
// start p
for (Map.Entry<Strng, Strng> startParam : startParamMap.entrySet()) {
f (!globalMap.contansKey(startParam.getKey())) {
globalMap.put(startParam.getKey(), startParam.getValue());
globalParamLst.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue()));
}
}
}
}
/**
* clear related data f command of process nstance s EXECUTE_TASK
* 1. fnd all task code from sub dag (only contans related task)
* 2. set the flag of tasks to Flag.NO
* 3. clear varPool data from re-execute task nstance n process nstance
* 4. remove related task nstance from taskInstanceMap, completeTaskMap, valdTaskMap, errorTaskMap
*
* @return task nstance
*/
protected vod clearDataIfExecuteTask() {
// only clear data f command s EXECUTE_TASK
f (!processInstance.getCommandType().equals(CommandType.EXECUTE_TASK)) {
return;
}
// Records the key of varPool data to be removed
Set<Strng> taskCodesStrng = dag.getAllNodesLst();
Lst<TaskInstance> removeTaskInstances = new ArrayLst<>();
for (Strng taskCodeStrng : taskCodesStrng) {
long taskCode = Long.parseLong(taskCodeStrng);
TaskInstance taskInstance;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
f (valdTaskMap.contansKey(taskCode)) {
taskInstance = taskInstanceMap.get(valdTaskMap.get(taskCode));
} else {
taskInstance = taskInstanceDao.fndTaskByInstanceIdAndCode(processInstance.getId(), taskCode);
}
f (taskInstance == null) {
contnue;
}
removeTaskInstances.add(taskInstance);
}
for (TaskInstance taskInstance : removeTaskInstances) {
taskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(taskInstance);
}
Set<Strng> removeSet = new HashSet<>();
for (TaskInstance taskInstance : removeTaskInstances) {
Strng taskVarPool = taskInstance.getVarPool();
f (StrngUtls.sNotEmpty(taskVarPool)) {
Lst<Property> propertes = JSONUtls.toLst(taskVarPool, Property.class);
Lst<Strng> keys = propertes.stream()
.flter(property -> property.getDrect().equals(Drect.OUT))
.map(property -> Strng.format("%s_%s", property.getProp(), property.getType()))
.collect(Collectors.toLst());
removeSet.addAll(keys);
}
}
// remove varPool data and update process nstance
// TODO: we can remove ths snppet f : we get varPool from pre taskInstance nstead of process nstance when
// task can not get pre task from ncomplete dag
Lst<Property> processPropertes = JSONUtls.toLst(processInstance.getVarPool(), Property.class);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,232 |
[Improvement][Master] Find a word spell error and a comment location error
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
I find a word spell error in WorkflowExecuteRunnable.java when i read the source code.
the 'weakup' may be a incorrect word, it may mislead people
<img width="974" alt="截屏2022-12-20 18 40 57" src="https://user-images.githubusercontent.com/15382560/208647796-3e37daa3-7ddf-4844-853c-9d74086aee9b.png">
and a comment in follow picture is not express the code block, I think it must move to the 'else' block, it describe the else block's logic
<img width="1071" alt="截屏2022-12-20 18 47 01" src="https://user-images.githubusercontent.com/15382560/208649155-0d2041b9-0176-4158-be55-aff6d7cd3e94.png">
### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13232
|
https://github.com/apache/dolphinscheduler/pull/13233
|
d795a7a0a33399426fedc8f91098467e4050b68e
|
d13cd55281e1758613fccb5199334e5415bdf0db
| 2022-12-20T10:48:18Z |
java
| 2022-12-21T08:22:03Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
processPropertes = processPropertes.stream()
.flter(property -> !(property.getDrect().equals(Drect.IN)
&& removeSet.contans(Strng.format("%s_%s", property.getProp(), property.getType()))))
.collect(Collectors.toLst());
processInstance.setVarPool(JSONUtls.toJsonStrng(processPropertes));
processInstanceDao.updateProcessInstance(processInstance);
// remove task nstance from taskInstanceMap, completeTaskMap, valdTaskMap, errorTaskMap
taskInstanceMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getValue().getTaskCode())));
completeTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
valdTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
errorTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
}
prvate vod saveCacheTaskInstance(TaskInstance taskInstance) {
Par<Integer, Strng> taskIdAndCacheKey = TaskCacheUtls.revertCacheKey(taskInstance.getCacheKey());
Integer taskId = taskIdAndCacheKey.getLeft();
f (taskId.equals(taskInstance.getId())) {
taskInstance.setCacheKey(taskIdAndCacheKey.getRght());
try {
taskInstanceDao.updateTaskInstance(taskInstance);
} catch (Excepton e) {
logger.error("update task nstance cache key faled", e);
}
}
}
prvate enum WorkflowRunnableStatus {
CREATED, INITIALIZE_DAG, INITIALIZE_QUEUE, STARTED,
;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
/*
* Lcensed to the Apache Software Foundaton (ASF) under one or more
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
* contrbutor lcense agreements. See the NOTICE fle dstrbuted wth
* ths work for addtonal nformaton regardng copyrght ownershp.
* The ASF lcenses ths fle to You under the Apache Lcense, Verson 2.0
* (the "Lcense"); you may not use ths fle except n complance wth
* the Lcense. You may obtan a copy of the Lcense at
*
* http://www.apache.org/lcenses/LICENSE-2.0
*
* Unless requred by applcable law or agreed to n wrtng, software
* dstrbuted under the Lcense s dstrbuted on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, ether express or mpled.
* See the Lcense for the specfc language governng permssons and
* lmtatons under the Lcense.
*/
package org.apache.dolphnscheduler.server.master.runner;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_END_DATE;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_COMPLEMENT_DATA_START_DATE;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_FATHER_PARAMS;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVERY_START_NODE_STRING;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_START_NODES;
mport statc org.apache.dolphnscheduler.common.constants.CommandKeyConstants.CMD_PARAM_START_PARAMS;
mport statc org.apache.dolphnscheduler.common.constants.Constants.COMMA;
mport statc org.apache.dolphnscheduler.common.constants.Constants.DEFAULT_WORKER_GROUP;
mport statc org.apache.dolphnscheduler.common.constants.DateConstants.YYYY_MM_DD_HH_MM_SS;
mport statc org.apache.dolphnscheduler.plugn.task.ap.TaskConstants.TASK_TYPE_BLOCKING;
mport statc org.apache.dolphnscheduler.plugn.task.ap.enums.DataType.VARCHAR;
mport statc org.apache.dolphnscheduler.plugn.task.ap.enums.Drect.IN;
mport org.apache.dolphnscheduler.common.constants.Constants;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
mport org.apache.dolphnscheduler.common.enums.CommandType;
mport org.apache.dolphnscheduler.common.enums.FalureStrategy;
mport org.apache.dolphnscheduler.common.enums.Flag;
mport org.apache.dolphnscheduler.common.enums.Prorty;
mport org.apache.dolphnscheduler.common.enums.StateEventType;
mport org.apache.dolphnscheduler.common.enums.TaskDependType;
mport org.apache.dolphnscheduler.common.enums.TaskGroupQueueStatus;
mport org.apache.dolphnscheduler.common.enums.WorkflowExecutonStatus;
mport org.apache.dolphnscheduler.common.graph.DAG;
mport org.apache.dolphnscheduler.common.model.TaskNodeRelaton;
mport org.apache.dolphnscheduler.common.thread.ThreadUtls;
mport org.apache.dolphnscheduler.common.utls.DateUtls;
mport org.apache.dolphnscheduler.common.utls.JSONUtls;
mport org.apache.dolphnscheduler.common.utls.NetUtls;
mport org.apache.dolphnscheduler.dao.entty.Command;
mport org.apache.dolphnscheduler.dao.entty.Envronment;
mport org.apache.dolphnscheduler.dao.entty.ProcessDefnton;
mport org.apache.dolphnscheduler.dao.entty.ProcessInstance;
mport org.apache.dolphnscheduler.dao.entty.ProcessTaskRelaton;
mport org.apache.dolphnscheduler.dao.entty.ProjectUser;
mport org.apache.dolphnscheduler.dao.entty.Schedule;
mport org.apache.dolphnscheduler.dao.entty.TaskDefntonLog;
mport org.apache.dolphnscheduler.dao.entty.TaskGroupQueue;
mport org.apache.dolphnscheduler.dao.entty.TaskInstance;
mport org.apache.dolphnscheduler.dao.repostory.ProcessInstanceDao;
mport org.apache.dolphnscheduler.dao.repostory.TaskDefntonLogDao;
mport org.apache.dolphnscheduler.dao.repostory.TaskInstanceDao;
mport org.apache.dolphnscheduler.dao.utls.TaskCacheUtls;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.DependResult;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.Drect;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
mport org.apache.dolphnscheduler.plugn.task.ap.enums.TaskExecutonStatus;
mport org.apache.dolphnscheduler.plugn.task.ap.model.Property;
mport org.apache.dolphnscheduler.remote.command.HostUpdateCommand;
mport org.apache.dolphnscheduler.remote.utls.Host;
mport org.apache.dolphnscheduler.server.master.confg.MasterConfg;
mport org.apache.dolphnscheduler.server.master.dspatch.executor.NettyExecutorManager;
mport org.apache.dolphnscheduler.server.master.event.StateEvent;
mport org.apache.dolphnscheduler.server.master.event.StateEventHandleError;
mport org.apache.dolphnscheduler.server.master.event.StateEventHandleExcepton;
mport org.apache.dolphnscheduler.server.master.event.StateEventHandleFalure;
mport org.apache.dolphnscheduler.server.master.event.StateEventHandler;
mport org.apache.dolphnscheduler.server.master.event.StateEventHandlerManager;
mport org.apache.dolphnscheduler.server.master.event.TaskStateEvent;
mport org.apache.dolphnscheduler.server.master.event.WorkflowStateEvent;
mport org.apache.dolphnscheduler.server.master.metrcs.TaskMetrcs;
mport org.apache.dolphnscheduler.server.master.runner.task.ITaskProcessor;
mport org.apache.dolphnscheduler.server.master.runner.task.TaskActon;
mport org.apache.dolphnscheduler.server.master.runner.task.TaskProcessorFactory;
mport org.apache.dolphnscheduler.servce.alert.ProcessAlertManager;
mport org.apache.dolphnscheduler.servce.command.CommandServce;
mport org.apache.dolphnscheduler.servce.cron.CronUtls;
mport org.apache.dolphnscheduler.servce.exceptons.CronParseExcepton;
mport org.apache.dolphnscheduler.servce.expand.CurngParamsServce;
mport org.apache.dolphnscheduler.servce.model.TaskNode;
mport org.apache.dolphnscheduler.servce.process.ProcessDag;
mport org.apache.dolphnscheduler.servce.process.ProcessServce;
mport org.apache.dolphnscheduler.servce.queue.PeerTaskInstancePrortyQueue;
mport org.apache.dolphnscheduler.servce.utls.DagHelper;
mport org.apache.dolphnscheduler.servce.utls.LoggerUtls;
mport org.apache.commons.collectons4.CollectonUtls;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
mport org.apache.commons.lang3.StrngUtls;
mport org.apache.commons.lang3.math.NumberUtls;
mport org.apache.commons.lang3.tuple.Par;
mport java.utl.ArrayLst;
mport java.utl.Arrays;
mport java.utl.Collecton;
mport java.utl.Collectons;
mport java.utl.Date;
mport java.utl.HashMap;
mport java.utl.HashSet;
mport java.utl.Iterator;
mport java.utl.Lst;
mport java.utl.Map;
mport java.utl.Objects;
mport java.utl.Optonal;
mport java.utl.Set;
mport java.utl.concurrent.Callable;
mport java.utl.concurrent.ConcurrentHashMap;
mport java.utl.concurrent.ConcurrentLnkedQueue;
mport java.utl.concurrent.atomc.AtomcBoolean;
mport java.utl.stream.Collectors;
mport lombok.NonNull;
mport org.slf4j.Logger;
mport org.slf4j.LoggerFactory;
mport org.sprngframework.beans.BeanUtls;
mport com.google.common.collect.Lsts;
mport com.google.common.collect.Sets;
/**
* Workflow execute task, used to execute a workflow nstance.
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
publc class WorkflowExecuteRunnable mplements Callable<WorkflowSubmtStatue> {
prvate statc fnal Logger logger = LoggerFactory.getLogger(WorkflowExecuteRunnable.class);
prvate fnal ProcessServce processServce;
prvate fnal CommandServce commandServce;
prvate ProcessInstanceDao processInstanceDao;
prvate TaskInstanceDao taskInstanceDao;
prvate TaskDefntonLogDao taskDefntonLogDao;
prvate fnal ProcessAlertManager processAlertManager;
prvate fnal NettyExecutorManager nettyExecutorManager;
prvate fnal ProcessInstance processInstance;
prvate ProcessDefnton processDefnton;
prvate DAG<Strng, TaskNode, TaskNodeRelaton> dag;
/**
* unque key of workflow
*/
prvate Strng key;
prvate WorkflowRunnableStatus workflowRunnableStatus = WorkflowRunnableStatus.CREATED;
/**
* submt falure nodes
*/
prvate boolean taskFaledSubmt = false;
/**
* task nstance hash map, taskId as key
*/
prvate fnal Map<Integer, TaskInstance> taskInstanceMap = new ConcurrentHashMap<>();
/**
* runnng taskProcessor, taskCode as key, taskProcessor as value
* only on taskProcessor per taskCode
*/
prvate fnal Map<Long, ITaskProcessor> actveTaskProcessorMaps = new ConcurrentHashMap<>();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
/**
* vald task map, taskCode as key, taskId as value
* n a DAG, only one taskInstance per taskCode s vald
*/
prvate fnal Map<Long, Integer> valdTaskMap = new ConcurrentHashMap<>();
/**
* error task map, taskCode as key, taskInstanceId as value
* n a DAG, only one taskInstance per taskCode s vald
*/
prvate fnal Map<Long, Integer> errorTaskMap = new ConcurrentHashMap<>();
/**
* complete task map, taskCode as key, taskInstanceId as value
* n a DAG, only one taskInstance per taskCode s vald
*/
prvate fnal Map<Long, Integer> completeTaskMap = new ConcurrentHashMap<>();
/**
* depend faled task set
*/
prvate fnal Set<Long> dependFaledTaskSet = Sets.newConcurrentHashSet();
/**
* forbdden task map, code as key
*/
prvate fnal Map<Long, TaskNode> forbddenTaskMap = new ConcurrentHashMap<>();
/**
* skp task map, code as key
*/
prvate fnal Map<Strng, TaskNode> skpTaskNodeMap = new ConcurrentHashMap<>();
/**
* complement date lst
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
prvate Lst<Date> complementLstDate = Lsts.newLnkedLst();
/**
* state event queue
*/
prvate fnal ConcurrentLnkedQueue<StateEvent> stateEvents = new ConcurrentLnkedQueue<>();
/**
* The StandBy task lst, wll be executed, need to know, the taskInstance n ths queue may doesn't have d.
*/
prvate fnal PeerTaskInstancePrortyQueue readyToSubmtTaskQueue = new PeerTaskInstancePrortyQueue();
/**
* wat to retry taskInstance map, taskCode as key, taskInstance as value
* before retry, the taskInstance d s 0
*/
prvate fnal Map<Long, TaskInstance> watToRetryTaskInstanceMap = new ConcurrentHashMap<>();
prvate fnal StateWheelExecuteThread stateWheelExecuteThread;
prvate fnal CurngParamsServce curngParamsServce;
prvate fnal Strng masterAddress;
/**
* @param processInstance processInstance
* @param processServce processServce
* @param processInstanceDao processInstanceDao
* @param nettyExecutorManager nettyExecutorManager
* @param processAlertManager processAlertManager
* @param masterConfg masterConfg
* @param stateWheelExecuteThread stateWheelExecuteThread
*/
publc WorkflowExecuteRunnable(
@NonNull ProcessInstance processInstance,
@NonNull CommandServce commandServce,
@NonNull ProcessServce processServce,
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
@NonNull ProcessInstanceDao processInstanceDao,
@NonNull NettyExecutorManager nettyExecutorManager,
@NonNull ProcessAlertManager processAlertManager,
@NonNull MasterConfg masterConfg,
@NonNull StateWheelExecuteThread stateWheelExecuteThread,
@NonNull CurngParamsServce curngParamsServce,
@NonNull TaskInstanceDao taskInstanceDao,
@NonNull TaskDefntonLogDao taskDefntonLogDao) {
ths.processServce = processServce;
ths.commandServce = commandServce;
ths.processInstanceDao = processInstanceDao;
ths.processInstance = processInstance;
ths.nettyExecutorManager = nettyExecutorManager;
ths.processAlertManager = processAlertManager;
ths.stateWheelExecuteThread = stateWheelExecuteThread;
ths.curngParamsServce = curngParamsServce;
ths.taskInstanceDao = taskInstanceDao;
ths.taskDefntonLogDao = taskDefntonLogDao;
ths.masterAddress = NetUtls.getAddr(masterConfg.getLstenPort());
TaskMetrcs.regsterTaskPrepared(readyToSubmtTaskQueue::sze);
}
/**
* the process start nodes are submtted completely.
*/
publc boolean sStart() {
return WorkflowRunnableStatus.STARTED == workflowRunnableStatus;
}
/**
* handle event
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
publc vod handleEvents() {
f (!sStart()) {
logger.nfo(
"The workflow nstance s not started, wll not handle ts state event, current state event sze: {}",
stateEvents);
return;
}
nt loopTmes = stateEvents.sze() * 2;
for (nt = 0; < loopTmes; ++) {
fnal StateEvent stateEvent = ths.stateEvents.peek();
try {
f (stateEvent == null) {
return;
}
LoggerUtls.setWorkflowAndTaskInstanceIDMDC(stateEvent.getProcessInstanceId(),
stateEvent.getTaskInstanceId());
checkProcessInstance(stateEvent);
StateEventHandler stateEventHandler =
StateEventHandlerManager.getStateEventHandler(stateEvent.getType())
.orElseThrow(() -> new StateEventHandleError(
"Cannot fnd handler for the gven state event"));
logger.nfo("Begn to handle state event, {}", stateEvent);
f (stateEventHandler.handleStateEvent(ths, stateEvent)) {
ths.stateEvents.remove(stateEvent);
}
} catch (StateEventHandleError stateEventHandleError) {
logger.error("State event handle error, wll remove ths event: {}", stateEvent, stateEventHandleError);
ths.stateEvents.remove(stateEvent);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
ThreadUtls.sleep(Constants.SLEEP_TIME_MILLIS);
} catch (StateEventHandleExcepton stateEventHandleExcepton) {
logger.error("State event handle error, wll retry ths event: {}",
stateEvent,
stateEventHandleExcepton);
ThreadUtls.sleep(Constants.SLEEP_TIME_MILLIS);
} catch (StateEventHandleFalure stateEventHandleFalure) {
logger.error("State event handle faled, wll move event to the tal: {}",
stateEvent,
stateEventHandleFalure);
ths.stateEvents.remove(stateEvent);
ths.stateEvents.offer(stateEvent);
ThreadUtls.sleep(Constants.SLEEP_TIME_MILLIS);
} catch (Excepton e) {
logger.error("State event handle error, get a unknown excepton, wll retry ths event: {}",
stateEvent,
e);
ThreadUtls.sleep(Constants.SLEEP_TIME_MILLIS);
} fnally {
LoggerUtls.removeWorkflowAndTaskInstanceIdMDC();
}
}
}
publc Strng getKey() {
f (StrngUtls.sNotEmpty(key) || ths.processDefnton == null) {
return key;
}
key = Strng.format("%d_%d_%d",
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
ths.processDefnton.getCode(),
ths.processDefnton.getVerson(),
ths.processInstance.getId());
return key;
}
publc boolean addStateEvent(StateEvent stateEvent) {
f (processInstance.getId() != stateEvent.getProcessInstanceId()) {
logger.nfo("state event would be abounded :{}", stateEvent);
return false;
}
ths.stateEvents.add(stateEvent);
return true;
}
publc nt eventSze() {
return ths.stateEvents.sze();
}
publc ProcessInstance getProcessInstance() {
return ths.processInstance;
}
publc boolean checkForceStartAndWakeUp(StateEvent stateEvent) {
TaskGroupQueue taskGroupQueue = ths.processServce.loadTaskGroupQueue(stateEvent.getTaskInstanceId());
f (taskGroupQueue.getForceStart() == Flag.YES.getCode()) {
TaskInstance taskInstance = ths.taskInstanceDao.fndTaskInstanceById(stateEvent.getTaskInstanceId());
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode());
taskProcessor.acton(TaskActon.DISPATCH);
ths.processServce.updateTaskGroupQueueStatus(taskGroupQueue.getTaskId(),
TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode());
return true;
}
f (taskGroupQueue.getInQueue() == Flag.YES.getCode()) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
boolean acqureTaskGroup = processServce.robTaskGroupResource(taskGroupQueue);
f (acqureTaskGroup) {
TaskInstance taskInstance = ths.taskInstanceDao.fndTaskInstanceById(stateEvent.getTaskInstanceId());
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode());
taskProcessor.acton(TaskActon.DISPATCH);
return true;
}
}
return false;
}
publc vod processTmeout() {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
ths.processAlertManager.sendProcessTmeoutAlert(ths.processInstance, projectUser);
}
publc vod taskTmeout(TaskInstance taskInstance) {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendTaskTmeoutAlert(processInstance, taskInstance, projectUser);
}
publc vod taskFnshed(TaskInstance taskInstance) throws StateEventHandleExcepton {
logger.nfo("TaskInstance fnshed task code:{} state:{}", taskInstance.getTaskCode(), taskInstance.getState());
try {
actveTaskProcessorMaps.remove(taskInstance.getTaskCode());
stateWheelExecuteThread.removeTask4TmeoutCheck(processInstance, taskInstance);
stateWheelExecuteThread.removeTask4RetryCheck(processInstance, taskInstance);
stateWheelExecuteThread.removeTask4StateCheck(processInstance, taskInstance);
f (taskInstance.getState().sSuccess()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
processInstance.setVarPool(taskInstance.getVarPool());
processInstanceDao.upsertProcessInstance(processInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
f (taskInstance.getIsCache().equals(Flag.YES)) {
saveCacheTaskInstance(taskInstance);
}
f (!processInstance.sBlocked()) {
submtPostNode(Long.toStrng(taskInstance.getTaskCode()));
}
} else f (taskInstance.taskCanRetry() && !processInstance.getState().sReadyStop()) {
logger.nfo("Retry taskInstance taskInstance state: {}", taskInstance.getState());
retryTaskInstance(taskInstance);
} else f (taskInstance.getState().sFalure()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
errorTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
f (processInstance.getFalureStrategy() == FalureStrategy.CONTINUE && DagHelper.haveAllNodeAfterNode(
Long.toStrng(taskInstance.getTaskCode()),
dag)) {
submtPostNode(Long.toStrng(taskInstance.getTaskCode()));
} else {
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
kllAllTasks();
}
}
} else f (taskInstance.getState().sFnshed()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
}
logger.nfo("TaskInstance fnshed wll try to update the workflow nstance state, task code:{} state:{}",
taskInstance.getTaskCode(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskInstance.getState());
ths.updateProcessInstanceState();
} catch (Excepton ex) {
logger.error("Task fnsh faled, get a excepton, wll remove ths taskInstance from completeTaskMap", ex);
completeTaskMap.remove(taskInstance.getTaskCode());
throw ex;
}
}
/**
* release task group
*
*/
publc vod releaseTaskGroup(TaskInstance taskInstance) {
logger.nfo("Release task group");
f (taskInstance.getTaskGroupId() > 0) {
TaskInstance nextTaskInstance = ths.processServce.releaseTaskGroup(taskInstance);
f (nextTaskInstance != null) {
f (nextTaskInstance.getProcessInstanceId() == taskInstance.getProcessInstanceId()) {
TaskStateEvent nextEvent = TaskStateEvent.bulder()
.processInstanceId(processInstance.getId())
.taskInstanceId(nextTaskInstance.getId())
.type(StateEventType.WAIT_TASK_GROUP)
.buld();
ths.stateEvents.add(nextEvent);
} else {
ProcessInstance processInstance =
ths.processServce.fndProcessInstanceById(nextTaskInstance.getProcessInstanceId());
ths.processServce.sendStartTask2Master(processInstance, nextTaskInstance.getId(),
org.apache.dolphnscheduler.remote.command.CommandType.TASK_WAKEUP_EVENT_REQUEST);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
}
}
}
/**
* crate new task nstance to retry, dfferent objects from the orgnal
*
*/
prvate vod retryTaskInstance(TaskInstance taskInstance) throws StateEventHandleExcepton {
f (!taskInstance.taskCanRetry()) {
return;
}
TaskInstance newTaskInstance = cloneRetryTaskInstance(taskInstance);
f (newTaskInstance == null) {
logger.error("Retry task fal because new taskInstance s null, task code:{}, task d:{}",
taskInstance.getTaskCode(),
taskInstance.getId());
return;
}
watToRetryTaskInstanceMap.put(newTaskInstance.getTaskCode(), newTaskInstance);
f (!taskInstance.retryTaskIntervalOverTme()) {
logger.nfo(
"Falure task wll be submtted, process d: {}, task nstance code: {}, state: {}, retry tmes: {} / {}, nterval: {}",
processInstance.getId(), newTaskInstance.getTaskCode(),
newTaskInstance.getState(), newTaskInstance.getRetryTmes(), newTaskInstance.getMaxRetryTmes(),
newTaskInstance.getRetryInterval());
stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, newTaskInstance);
stateWheelExecuteThread.addTask4RetryCheck(processInstance, newTaskInstance);
} else {
addTaskToStandByLst(newTaskInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
submtStandByTask();
watToRetryTaskInstanceMap.remove(newTaskInstance.getTaskCode());
}
}
/**
* update process nstance
*/
publc vod refreshProcessInstance(nt processInstanceId) {
logger.nfo("process nstance update: {}", processInstanceId);
ProcessInstance newProcessInstance = processServce.fndProcessInstanceById(processInstanceId);
BeanUtls.copyPropertes(newProcessInstance, processInstance);
processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
processInstance.getProcessDefntonVerson());
processInstance.setProcessDefnton(processDefnton);
}
/**
* update task nstance
*/
publc vod refreshTaskInstance(nt taskInstanceId) {
logger.nfo("task nstance update: {} ", taskInstanceId);
TaskInstance taskInstance = taskInstanceDao.fndTaskInstanceById(taskInstanceId);
f (taskInstance == null) {
logger.error("can not fnd task nstance, d:{}", taskInstanceId);
return;
}
processServce.packageTaskInstance(taskInstance, processInstance);
taskInstanceMap.put(taskInstance.getId(), taskInstance);
valdTaskMap.remove(taskInstance.getTaskCode());
f (Flag.YES == taskInstance.getFlag()) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
valdTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
}
}
/**
* check process nstance by state event
*/
publc vod checkProcessInstance(StateEvent stateEvent) throws StateEventHandleError {
f (ths.processInstance.getId() != stateEvent.getProcessInstanceId()) {
throw new StateEventHandleError("The event doesn't contans process nstance d");
}
}
/**
* check f task nstance exst by state event
*/
publc vod checkTaskInstanceByStateEvent(TaskStateEvent stateEvent) throws StateEventHandleError {
f (stateEvent.getTaskInstanceId() == null || stateEvent.getTaskInstanceId() == 0) {
throw new StateEventHandleError("The taskInstanceId s 0");
}
f (!taskInstanceMap.contansKey(stateEvent.getTaskInstanceId())) {
throw new StateEventHandleError("Cannot fnd the taskInstance from taskInstanceMap");
}
}
/**
* check f task nstance exst by d
*/
publc boolean checkTaskInstanceById(nt taskInstanceId) {
f (taskInstanceMap.sEmpty()) {
return false;
}
return taskInstanceMap.contansKey(taskInstanceId);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* get task nstance from memory
*/
publc Optonal<TaskInstance> getTaskInstance(nt taskInstanceId) {
return Optonal.ofNullable(taskInstanceMap.get(taskInstanceId));
}
publc Optonal<TaskInstance> getTaskInstance(long taskCode) {
f (taskInstanceMap.sEmpty()) {
return Optonal.empty();
}
for (TaskInstance taskInstance : taskInstanceMap.values()) {
f (taskInstance.getTaskCode() == taskCode) {
return Optonal.of(taskInstance);
}
}
return Optonal.empty();
}
publc Optonal<TaskInstance> getActveTaskInstanceByTaskCode(long taskCode) {
Integer taskInstanceId = valdTaskMap.get(taskCode);
f (taskInstanceId != null) {
return Optonal.ofNullable(taskInstanceMap.get(taskInstanceId));
}
return Optonal.empty();
}
publc Optonal<TaskInstance> getRetryTaskInstanceByTaskCode(long taskCode) {
f (watToRetryTaskInstanceMap.contansKey(taskCode)) {
return Optonal.ofNullable(watToRetryTaskInstanceMap.get(taskCode));
}
return Optonal.empty();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
publc vod processBlock() {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendProcessBlockngAlert(processInstance, projectUser);
logger.nfo("processInstance {} block alert send successful!", processInstance.getId());
}
publc boolean processComplementData() {
f (!needComplementProcess()) {
return false;
}
f (processInstance.getState().sReadyStop() || !processInstance.getState().sFnshed()) {
return false;
}
Date scheduleDate = processInstance.getScheduleTme();
f (scheduleDate == null) {
scheduleDate = complementLstDate.get(0);
} else f (processInstance.getState().sFnshed()) {
endProcess();
f (complementLstDate.sEmpty()) {
logger.nfo("process complement end. process d:{}", processInstance.getId());
return true;
}
nt ndex = complementLstDate.ndexOf(scheduleDate);
f (ndex >= complementLstDate.sze() - 1 || !processInstance.getState().sSuccess()) {
logger.nfo("process complement end. process d:{}", processInstance.getId());
return true;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo("process complement contnue. process d:{}, schedule tme:{} complementLstDate:{}",
processInstance.getId(), processInstance.getScheduleTme(), complementLstDate);
scheduleDate = complementLstDate.get(ndex + 1);
}
nt create = ths.createComplementDataCommand(scheduleDate);
f (create > 0) {
logger.nfo("create complement data command successfully.");
}
return true;
}
prvate nt createComplementDataCommand(Date scheduleDate) {
Command command = new Command();
command.setScheduleTme(scheduleDate);
command.setCommandType(CommandType.COMPLEMENT_DATA);
command.setProcessDefntonCode(processInstance.getProcessDefntonCode());
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
f (cmdParam.contansKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(CMD_PARAM_RECOVERY_START_NODE_STRING);
}
f (cmdParam.contansKey(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) {
cmdParam.replace(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST,
cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)
.substrng(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST).ndexOf(COMMA) + 1));
}
f (cmdParam.contansKey(CMD_PARAM_COMPLEMENT_DATA_START_DATE)) {
cmdParam.replace(CMD_PARAM_COMPLEMENT_DATA_START_DATE,
DateUtls.format(scheduleDate, YYYY_MM_DD_HH_MM_SS, null));
}
command.setCommandParam(JSONUtls.toJsonStrng(cmdParam));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
command.setTaskDependType(processInstance.getTaskDependType());
command.setFalureStrategy(processInstance.getFalureStrategy());
command.setWarnngType(processInstance.getWarnngType());
command.setWarnngGroupId(processInstance.getWarnngGroupId());
command.setStartTme(new Date());
command.setExecutorId(processInstance.getExecutorId());
command.setUpdateTme(new Date());
command.setProcessInstanceProrty(processInstance.getProcessInstanceProrty());
command.setWorkerGroup(processInstance.getWorkerGroup());
command.setEnvronmentCode(processInstance.getEnvronmentCode());
command.setDryRun(processInstance.getDryRun());
command.setProcessInstanceId(0);
command.setProcessDefntonVerson(processInstance.getProcessDefntonVerson());
command.setTestFlag(processInstance.getTestFlag());
return commandServce.createCommand(command);
}
prvate boolean needComplementProcess() {
return processInstance.sComplementData() && Flag.NO == processInstance.getIsSubProcess();
}
/**
* ProcessInstance start entrypont.
*/
@Overrde
publc WorkflowSubmtStatue call() {
f (sStart()) {
logger.warn("[WorkflowInstance-{}] The workflow has already been started", processInstance.getId());
return WorkflowSubmtStatue.DUPLICATED_SUBMITTED;
}
try {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
LoggerUtls.setWorkflowInstanceIdMDC(processInstance.getId());
f (workflowRunnableStatus == WorkflowRunnableStatus.CREATED) {
buldFlowDag();
workflowRunnableStatus = WorkflowRunnableStatus.INITIALIZE_DAG;
logger.nfo("workflowStatue changed to :{}", workflowRunnableStatus);
}
f (workflowRunnableStatus == WorkflowRunnableStatus.INITIALIZE_DAG) {
ntTaskQueue();
workflowRunnableStatus = WorkflowRunnableStatus.INITIALIZE_QUEUE;
logger.nfo("workflowStatue changed to :{}", workflowRunnableStatus);
}
f (workflowRunnableStatus == WorkflowRunnableStatus.INITIALIZE_QUEUE) {
submtPostNode(null);
workflowRunnableStatus = WorkflowRunnableStatus.STARTED;
logger.nfo("workflowStatue changed to :{}", workflowRunnableStatus);
}
return WorkflowSubmtStatue.SUCCESS;
} catch (Excepton e) {
logger.error("Start workflow error", e);
return WorkflowSubmtStatue.FAILED;
} fnally {
LoggerUtls.removeWorkflowInstanceIdMDC();
}
}
/**
* process end handle
*/
publc vod endProcess() {
ths.stateEvents.clear();
f (processDefnton.getExecutonType().typeIsSeralWat() || processDefnton.getExecutonType()
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
.typeIsSeralProrty()) {
checkSeralProcess(processDefnton);
}
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendAlertProcessInstance(processInstance, getValdTaskLst(), projectUser);
f (processInstance.getState().sSuccess()) {
processAlertManager.closeAlert(processInstance);
}
f (checkTaskQueue()) {
processServce.releaseAllTaskGroup(processInstance.getId());
}
}
publc vod checkSeralProcess(ProcessDefnton processDefnton) {
nt nextInstanceId = processInstance.getNextProcessInstanceId();
f (nextInstanceId == 0) {
ProcessInstance nextProcessInstance =
ths.processServce.loadNextProcess4Seral(processInstance.getProcessDefnton().getCode(),
WorkflowExecutonStatus.SERIAL_WAIT.getCode(), processInstance.getId());
f (nextProcessInstance == null) {
return;
}
ProcessInstance nextReadyStopProcessInstance =
ths.processServce.loadNextProcess4Seral(processInstance.getProcessDefnton().getCode(),
WorkflowExecutonStatus.READY_STOP.getCode(), processInstance.getId());
f (processDefnton.getExecutonType().typeIsSeralProrty() && nextReadyStopProcessInstance != null) {
return;
}
nextInstanceId = nextProcessInstance.getId();
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
ProcessInstance nextProcessInstance = ths.processServce.fndProcessInstanceById(nextInstanceId);
f (nextProcessInstance.getState().sFnshed() || nextProcessInstance.getState().sRunnng()) {
return;
}
Map<Strng, Object> cmdParam = new HashMap<>();
cmdParam.put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, nextInstanceId);
Command command = new Command();
command.setCommandType(CommandType.RECOVER_SERIAL_WAIT);
command.setProcessInstanceId(nextProcessInstance.getId());
command.setProcessDefntonCode(processDefnton.getCode());
command.setProcessDefntonVerson(processDefnton.getVerson());
command.setCommandParam(JSONUtls.toJsonStrng(cmdParam));
commandServce.createCommand(command);
}
/**
* Generate process dag
*
* @throws Excepton excepton
*/
prvate vod buldFlowDag() throws Excepton {
processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
processInstance.getProcessDefntonVerson());
processInstance.setProcessDefnton(processDefnton);
Lst<TaskInstance> recoverNodeLst = getRecoverTaskInstanceLst(processInstance.getCommandParam());
Lst<ProcessTaskRelaton> processTaskRelatons =
processServce.fndRelatonByCode(processDefnton.getCode(), processDefnton.getVerson());
Lst<TaskDefntonLog> taskDefntonLogs =
taskDefntonLogDao.getTaskDefneLogLstByRelaton(processTaskRelatons);
Lst<TaskNode> taskNodeLst = processServce.transformTask(processTaskRelatons, taskDefntonLogs);
forbddenTaskMap.clear();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskNodeLst.forEach(taskNode -> {
f (taskNode.sForbdden()) {
forbddenTaskMap.put(taskNode.getCode(), taskNode);
}
});
Lst<Strng> recoveryNodeCodeLst = getRecoveryNodeCodeLst(recoverNodeLst);
Lst<Strng> startNodeNameLst = parseStartNodeName(processInstance.getCommandParam());
ProcessDag processDag = generateFlowDag(taskNodeLst, startNodeNameLst, recoveryNodeCodeLst,
processInstance.getTaskDependType());
f (processDag == null) {
logger.error("ProcessDag s null");
return;
}
dag = DagHelper.buldDagGraph(processDag);
logger.nfo("Buld dag success, dag: {}", dag);
}
/**
* nt task queue
*/
prvate vod ntTaskQueue() throws StateEventHandleExcepton, CronParseExcepton {
taskFaledSubmt = false;
actveTaskProcessorMaps.clear();
dependFaledTaskSet.clear();
completeTaskMap.clear();
errorTaskMap.clear();
f (!sNewProcessInstance()) {
logger.nfo("The workflowInstance s not a newly runnng nstance, runtmes: {}, recover flag: {}",
processInstance.getRunTmes(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
processInstance.getRecovery());
Lst<TaskInstance> valdTaskInstanceLst =
taskInstanceDao.fndValdTaskLstByProcessId(processInstance.getId(),
processInstance.getTestFlag());
for (TaskInstance task : valdTaskInstanceLst) {
try {
LoggerUtls.setWorkflowAndTaskInstanceIDMDC(task.getProcessInstanceId(), task.getId());
logger.nfo(
"Check the taskInstance from a exst workflowInstance, exstTaskInstanceCode: {}, taskInstanceStatus: {}",
task.getTaskCode(),
task.getState());
f (valdTaskMap.contansKey(task.getTaskCode())) {
logger.warn(
"Have same taskCode taskInstance when nt task queue, need to check taskExecutonStatus, taskCode:{}",
task.getTaskCode());
nt oldTaskInstanceId = valdTaskMap.get(task.getTaskCode());
TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId);
f (!oldTaskInstance.getState().sFnshed() && task.getState().sFnshed()) {
task.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(task);
contnue;
}
}
valdTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
f (task.sTaskComplete()) {
logger.nfo("TaskInstance s already complete.");
completeTaskMap.put(task.getTaskCode(), task.getId());
contnue;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
f (task.sCondtonsTask() || DagHelper.haveCondtonsAfterNode(Long.toStrng(task.getTaskCode()),
dag)) {
contnue;
}
f (task.taskCanRetry()) {
f (task.getState().sNeedFaultTolerance()) {
logger.nfo("TaskInstance needs fault tolerance, wll be added to standby lst.");
task.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(task);
TaskInstance tolerantTaskInstance = cloneTolerantTaskInstance(task);
addTaskToStandByLst(tolerantTaskInstance);
} else {
logger.nfo("Retry taskInstance, taskState: {}", task.getState());
retryTaskInstance(task);
}
contnue;
}
f (task.getState().sFalure()) {
errorTaskMap.put(task.getTaskCode(), task.getId());
}
} fnally {
LoggerUtls.removeWorkflowAndTaskInstanceIdMDC();
}
}
clearDataIfExecuteTask();
} else {
logger.nfo("The current workflowInstance s a newly runnng workflowInstance");
}
f (processInstance.sComplementData() && complementLstDate.sEmpty()) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
f (cmdParam != null) {
setGlobalParamIfCommanded(processDefnton, cmdParam);
Date start = null;
Date end = null;
f (cmdParam.contansKey(CMD_PARAM_COMPLEMENT_DATA_START_DATE)
&& cmdParam.contansKey(CMD_PARAM_COMPLEMENT_DATA_END_DATE)) {
start = DateUtls.strngToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_START_DATE));
end = DateUtls.strngToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
}
f (complementLstDate.sEmpty() && needComplementProcess()) {
f (start != null && end != null) {
Lst<Schedule> schedules = processServce.queryReleaseSchedulerLstByProcessDefntonCode(
processInstance.getProcessDefntonCode());
complementLstDate = CronUtls.getSelfFreDateLst(start, end, schedules);
}
f (cmdParam.contansKey(CMD_PARAM_COMPLEMENT_DATA_SCHEDULE_DATE_LIST)) {
complementLstDate = CronUtls.getSelfScheduleDateLst(cmdParam);
}
logger.nfo(" process defnton code:{} complement data: {}",
processInstance.getProcessDefntonCode(), complementLstDate);
f (!complementLstDate.sEmpty() && Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTme(complementLstDate.get(0));
Strng globalParams = curngParamsServce.curngGlobalParams(processInstance.getId(),
processDefnton.getGlobalParamMap(),
processDefnton.getGlobalParamLst(),
CommandType.COMPLEMENT_DATA,
processInstance.getScheduleTme(),
cmdParam.get(Constants.SCHEDULE_TIMEZONE));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
processInstance.setGlobalParams(globalParams);
processInstanceDao.updateProcessInstance(processInstance);
}
}
}
}
logger.nfo("Intalze task queue, dependFaledTaskSet: {}, completeTaskMap: {}, errorTaskMap: {}",
dependFaledTaskSet,
completeTaskMap,
errorTaskMap);
}
/**
* submt task to execute
*
* @param taskInstance task nstance
* @return TaskInstance
*/
prvate Optonal<TaskInstance> submtTaskExec(TaskInstance taskInstance) {
try {
processServce.packageTaskInstance(taskInstance, processInstance);
ITaskProcessor taskProcessor = TaskProcessorFactory.getTaskProcessor(taskInstance.getTaskType());
taskProcessor.nt(taskInstance, processInstance);
f (taskInstance.getState().sRunnng()
&& taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) {
notfyProcessHostUpdate(taskInstance);
}
boolean submt = taskProcessor.acton(TaskActon.SUBMIT);
f (!submt) {
logger.error("Submt standby task faled!, taskCode: {}, taskName: {}",
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskInstance.getTaskCode(),
taskInstance.getName());
return Optonal.empty();
}
LoggerUtls.setWorkflowAndTaskInstanceIDMDC(taskInstance.getProcessInstanceId(), taskInstance.getId());
f (valdTaskMap.contansKey(taskInstance.getTaskCode())) {
nt oldTaskInstanceId = valdTaskMap.get(taskInstance.getTaskCode());
f (taskInstance.getId() != oldTaskInstanceId) {
TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId);
oldTaskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(oldTaskInstance);
valdTaskMap.remove(taskInstance.getTaskCode());
actveTaskProcessorMaps.remove(taskInstance.getTaskCode());
}
}
valdTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
taskInstanceMap.put(taskInstance.getId(), taskInstance);
actveTaskProcessorMaps.put(taskInstance.getTaskCode(), taskProcessor);
nt taskGroupId = taskInstance.getTaskGroupId();
f (taskGroupId > 0) {
boolean acqureTaskGroup = processServce.acqureTaskGroup(taskInstance.getId(),
taskInstance.getName(),
taskGroupId,
taskInstance.getProcessInstanceId(),
taskInstance.getTaskGroupProrty());
f (!acqureTaskGroup) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo(
"Submtted task wll not be dspatch rght now because the frst tme to try to acqure" +
" task group faled, taskInstanceName: {}, taskGroupId: {}",
taskInstance.getName(), taskGroupId);
return Optonal.of(taskInstance);
}
}
boolean dspatchSuccess = taskProcessor.acton(TaskActon.DISPATCH);
f (!dspatchSuccess) {
logger.error("Dspatch standby process {} task {} faled", processInstance.getName(),
taskInstance.getName());
return Optonal.empty();
}
taskProcessor.acton(TaskActon.RUN);
stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, taskInstance);
stateWheelExecuteThread.addTask4StateCheck(processInstance, taskInstance);
f (taskProcessor.taskInstance().getState().sFnshed()) {
f (processInstance.sBlocked()) {
TaskStateEvent processBlockEvent = TaskStateEvent.bulder()
.processInstanceId(processInstance.getId())
.taskInstanceId(taskInstance.getId())
.status(taskProcessor.taskInstance().getState())
.type(StateEventType.PROCESS_BLOCKED)
.buld();
ths.stateEvents.add(processBlockEvent);
}
TaskStateEvent taskStateChangeEvent = TaskStateEvent.bulder()
.processInstanceId(processInstance.getId())
.taskInstanceId(taskInstance.getId())
.status(taskProcessor.taskInstance().getState())
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
.type(StateEventType.TASK_STATE_CHANGE)
.buld();
ths.stateEvents.add(taskStateChangeEvent);
}
return Optonal.of(taskInstance);
} catch (Excepton e) {
logger.error("Submt standby task {} error, taskCode: {}", taskInstance.getName(),
taskInstance.getTaskCode(), e);
return Optonal.empty();
} fnally {
LoggerUtls.removeWorkflowAndTaskInstanceIdMDC();
}
}
prvate vod notfyProcessHostUpdate(TaskInstance taskInstance) {
f (StrngUtls.sEmpty(taskInstance.getHost())) {
return;
}
try {
HostUpdateCommand hostUpdateCommand = new HostUpdateCommand();
hostUpdateCommand.setProcessHost(masterAddress);
hostUpdateCommand.setTaskInstanceId(taskInstance.getId());
Host host = new Host(taskInstance.getHost());
nettyExecutorManager.doExecute(host, hostUpdateCommand.convert2Command());
} catch (Excepton e) {
logger.error("notfy process host update", e);
}
}
/**
* fnd task nstance n db.
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
* n case submt more than one same name task n the same tme.
*
* @param taskCode task code
* @param taskVerson task verson
* @return TaskInstance
*/
prvate TaskInstance fndTaskIfExsts(Long taskCode, nt taskVerson) {
Lst<TaskInstance> valdTaskInstanceLst = getValdTaskLst();
for (TaskInstance taskInstance : valdTaskInstanceLst) {
f (taskInstance.getTaskCode() == taskCode && taskInstance.getTaskDefntonVerson() == taskVerson) {
return taskInstance;
}
}
return null;
}
/**
* encapsulaton task, ths method wll only create a new task nstance, the return task nstance wll not contan d.
*
* @param processInstance process nstance
* @param taskNode taskNode
* @return TaskInstance
*/
prvate TaskInstance createTaskInstance(ProcessInstance processInstance, TaskNode taskNode) {
TaskInstance taskInstance = fndTaskIfExsts(taskNode.getCode(), taskNode.getVerson());
f (taskInstance != null) {
return taskInstance;
}
return newTaskInstance(processInstance, taskNode);
}
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
* clone a new taskInstance for retry and reset some logc felds
*
* @return taskInstance
*/
publc TaskInstance cloneRetryTaskInstance(TaskInstance taskInstance) {
TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode()));
f (taskNode == null) {
logger.error("Clone retry taskInstance error because taskNode s null, taskCode:{}",
taskInstance.getTaskCode());
return null;
}
TaskInstance newTaskInstance = newTaskInstance(processInstance, taskNode);
newTaskInstance.setTaskDefne(taskInstance.getTaskDefne());
newTaskInstance.setProcessDefne(taskInstance.getProcessDefne());
newTaskInstance.setProcessInstance(processInstance);
newTaskInstance.setRetryTmes(taskInstance.getRetryTmes() + 1);
newTaskInstance.setState(taskInstance.getState());
newTaskInstance.setEndTme(taskInstance.getEndTme());
f (taskInstance.getState() == TaskExecutonStatus.NEED_FAULT_TOLERANCE) {
newTaskInstance.setAppLnk(taskInstance.getAppLnk());
}
return newTaskInstance;
}
/**
* clone a new taskInstance for tolerant and reset some logc felds
*
* @return taskInstance
*/
publc TaskInstance cloneTolerantTaskInstance(TaskInstance taskInstance) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode()));
f (taskNode == null) {
logger.error("Clone tolerant taskInstance error because taskNode s null, taskCode:{}",
taskInstance.getTaskCode());
return null;
}
TaskInstance newTaskInstance = newTaskInstance(processInstance, taskNode);
newTaskInstance.setTaskDefne(taskInstance.getTaskDefne());
newTaskInstance.setProcessDefne(taskInstance.getProcessDefne());
newTaskInstance.setProcessInstance(processInstance);
newTaskInstance.setRetryTmes(taskInstance.getRetryTmes());
newTaskInstance.setState(taskInstance.getState());
newTaskInstance.setAppLnk(taskInstance.getAppLnk());
return newTaskInstance;
}
/**
* new a taskInstance
*
* @param processInstance process nstance
* @param taskNode task node
* @return task nstance
*/
publc TaskInstance newTaskInstance(ProcessInstance processInstance, TaskNode taskNode) {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setTaskCode(taskNode.getCode());
taskInstance.setTaskDefntonVerson(taskNode.getVerson());
taskInstance.setName(taskNode.getName());
taskInstance.setState(TaskExecutonStatus.SUBMITTED_SUCCESS);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskInstance.setProcessInstanceId(processInstance.getId());
taskInstance.setTaskType(taskNode.getType().toUpperCase());
taskInstance.setAlertFlag(Flag.NO);
taskInstance.setStartTme(null);
taskInstance.setTestFlag(processInstance.getTestFlag());
taskInstance.setFlag(Flag.YES);
taskInstance.setDryRun(processInstance.getDryRun());
taskInstance.setRetryTmes(0);
taskInstance.setMaxRetryTmes(taskNode.getMaxRetryTmes());
taskInstance.setRetryInterval(taskNode.getRetryInterval());
taskInstance.setTaskParams(taskNode.getTaskParams());
taskInstance.setTaskGroupId(taskNode.getTaskGroupId());
taskInstance.setTaskGroupProrty(taskNode.getTaskGroupProrty());
taskInstance.setCpuQuota(taskNode.getCpuQuota());
taskInstance.setMemoryMax(taskNode.getMemoryMax());
taskInstance.setIsCache(taskNode.getIsCache() == Flag.YES.getCode() ? Flag.YES : Flag.NO);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
f (taskNode.getTaskInstanceProrty() == null) {
taskInstance.setTaskInstanceProrty(Prorty.MEDIUM);
} else {
taskInstance.setTaskInstanceProrty(taskNode.getTaskInstanceProrty());
}
Strng processWorkerGroup = processInstance.getWorkerGroup();
processWorkerGroup = StrngUtls.sBlank(processWorkerGroup) ? DEFAULT_WORKER_GROUP : processWorkerGroup;
Strng taskWorkerGroup =
StrngUtls.sBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup();
Long processEnvronmentCode =
Objects.sNull(processInstance.getEnvronmentCode()) ? -1 : processInstance.getEnvronmentCode();
Long taskEnvronmentCode =
Objects.sNull(taskNode.getEnvronmentCode()) ? processEnvronmentCode : taskNode.getEnvronmentCode();
f (!processWorkerGroup.equals(DEFAULT_WORKER_GROUP) && taskWorkerGroup.equals(DEFAULT_WORKER_GROUP)) {
taskInstance.setWorkerGroup(processWorkerGroup);
taskInstance.setEnvronmentCode(processEnvronmentCode);
} else {
taskInstance.setWorkerGroup(taskWorkerGroup);
taskInstance.setEnvronmentCode(taskEnvronmentCode);
}
f (!taskInstance.getEnvronmentCode().equals(-1L)) {
Envronment envronment = processServce.fndEnvronmentByCode(taskInstance.getEnvronmentCode());
f (Objects.nonNull(envronment) && StrngUtls.sNotEmpty(envronment.getConfg())) {
taskInstance.setEnvronmentConfg(envronment.getConfg());
}
}
taskInstance.setDelayTme(taskNode.getDelayTme());
taskInstance.setTaskExecuteType(taskNode.getTaskExecuteType());
return taskInstance;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
publc vod getPreVarPool(TaskInstance taskInstance, Set<Strng> preTask) {
Map<Strng, Property> allProperty = new HashMap<>();
Map<Strng, TaskInstance> allTaskInstance = new HashMap<>();
f (CollectonUtls.sNotEmpty(preTask)) {
for (Strng preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
f (taskId == null) {
contnue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
f (preTaskInstance == null) {
contnue;
}
Strng preVarPool = preTaskInstance.getVarPool();
f (StrngUtls.sNotEmpty(preVarPool)) {
Lst<Property> propertes = JSONUtls.toLst(preVarPool, Property.class);
for (Property nfo : propertes) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, nfo);
}
}
}
f (allProperty.sze() > 0) {
taskInstance.setVarPool(JSONUtls.toJsonStrng(allProperty.values()));
}
} else {
f (StrngUtls.sNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
publc Collecton<TaskInstance> getAllTaskInstances() {
return taskInstanceMap.values();
}
prvate vod setVarPoolValue(Map<Strng, Property> allProperty, Map<Strng, TaskInstance> allTaskInstance,
TaskInstance preTaskInstance, Property thsProperty) {
thsProperty.setDrect(Drect.IN);
Strng proName = thsProperty.getProp();
f (allProperty.contansKey(proName)) {
Property otherPro = allProperty.get(proName);
f (StrngUtls.sEmpty(thsProperty.getValue())) {
allProperty.put(proName, otherPro);
} else f (StrngUtls.sNotEmpty(otherPro.getValue())) {
TaskInstance otherTask = allTaskInstance.get(proName);
f (otherTask.getEndTme().getTme() > preTaskInstance.getEndTme().getTme()) {
allProperty.put(proName, thsProperty);
allTaskInstance.put(proName, preTaskInstance);
} else {
allProperty.put(proName, otherPro);
}
} else {
allProperty.put(proName, thsProperty);
allTaskInstance.put(proName, preTaskInstance);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
} else {
allProperty.put(proName, thsProperty);
allTaskInstance.put(proName, preTaskInstance);
}
}
/**
* get complete task nstance map, taskCode as key
*/
prvate Map<Strng, TaskInstance> getCompleteTaskInstanceMap() {
Map<Strng, TaskInstance> completeTaskInstanceMap = new HashMap<>();
for (Map.Entry<Long, Integer> entry : completeTaskMap.entrySet()) {
Long taskConde = entry.getKey();
Integer taskInstanceId = entry.getValue();
TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId);
f (taskInstance == null) {
logger.warn("Cannot fnd the taskInstance from taskInstanceMap, taskInstanceId: {}, taskConde: {}",
taskInstanceId,
taskConde);
contnue;
}
completeTaskInstanceMap.put(Long.toStrng(taskInstance.getTaskCode()), taskInstance);
}
return completeTaskInstanceMap;
}
/**
* get vald task lst
*/
prvate Lst<TaskInstance> getValdTaskLst() {
Lst<TaskInstance> valdTaskInstanceLst = new ArrayLst<>();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
for (Integer taskInstanceId : valdTaskMap.values()) {
valdTaskInstanceLst.add(taskInstanceMap.get(taskInstanceId));
}
return valdTaskInstanceLst;
}
prvate vod submtPostNode(Strng parentNodeCode) throws StateEventHandleExcepton {
Set<Strng> submtTaskNodeLst =
DagHelper.parsePostNodes(parentNodeCode, skpTaskNodeMap, dag, getCompleteTaskInstanceMap());
Lst<TaskInstance> taskInstances = new ArrayLst<>();
for (Strng taskNode : submtTaskNodeLst) {
TaskNode taskNodeObject = dag.getNode(taskNode);
Optonal<TaskInstance> exstTaskInstanceOptonal = getTaskInstance(taskNodeObject.getCode());
f (exstTaskInstanceOptonal.sPresent()) {
taskInstances.add(exstTaskInstanceOptonal.get());
contnue;
}
TaskInstance task = createTaskInstance(processInstance, taskNodeObject);
taskInstances.add(task);
}
f (StrngUtls.sNotEmpty(parentNodeCode) && dag.getEndNode().contans(parentNodeCode)) {
TaskInstance endTaskInstance = taskInstanceMap.get(completeTaskMap.get(NumberUtls.toLong(parentNodeCode)));
Strng taskInstanceVarPool = endTaskInstance.getVarPool();
f (StrngUtls.sNotEmpty(taskInstanceVarPool)) {
Set<Property> taskPropertes = new HashSet<>(JSONUtls.toLst(taskInstanceVarPool, Property.class));
Strng processInstanceVarPool = processInstance.getVarPool();
f (StrngUtls.sNotEmpty(processInstanceVarPool)) {
Set<Property> propertes = new HashSet<>(JSONUtls.toLst(processInstanceVarPool, Property.class));
propertes.addAll(taskPropertes);
processInstance.setVarPool(JSONUtls.toJsonStrng(propertes));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
} else {
processInstance.setVarPool(JSONUtls.toJsonStrng(taskPropertes));
}
}
}
for (TaskInstance task : taskInstances) {
f (readyToSubmtTaskQueue.contans(task)) {
logger.warn("Task s already at submt queue, taskInstanceId: {}", task.getId());
contnue;
}
f (task.getId() != null && completeTaskMap.contansKey(task.getTaskCode())) {
logger.nfo("Task has already run success, taskName: {}", task.getName());
contnue;
}
f (task.getState().sKll()) {
logger.nfo("Task s be stopped, the state s {}, taskInstanceId: {}", task.getState(), task.getId());
contnue;
}
addTaskToStandByLst(task);
}
submtStandByTask();
updateProcessInstanceState();
}
/**
* determne whether the dependences of the task node are complete
*
* @return DependResult
*/
prvate DependResult sTaskDepsComplete(Strng taskCode) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
Collecton<Strng> startNodes = dag.getBegnNode();
f (startNodes.contans(taskCode)) {
return DependResult.SUCCESS;
}
TaskNode taskNode = dag.getNode(taskCode);
Lst<Strng> ndrectDepCodeLst = new ArrayLst<>();
setIndrectDepLst(taskCode, ndrectDepCodeLst);
for (Strng depsNode : ndrectDepCodeLst) {
f (dag.contansNode(depsNode) && !skpTaskNodeMap.contansKey(depsNode)) {
Long despNodeTaskCode = Long.parseLong(depsNode);
f (!completeTaskMap.contansKey(despNodeTaskCode)) {
return DependResult.WAITING;
}
Integer depsTaskId = completeTaskMap.get(despNodeTaskCode);
TaskExecutonStatus depTaskState = taskInstanceMap.get(depsTaskId).getState();
f (depTaskState.sKll()) {
return DependResult.NON_EXEC;
}
f (taskNode.sBlockngTask()) {
contnue;
}
f (taskNode.sCondtonsTask()) {
contnue;
}
f (!dependTaskSuccess(depsNode, taskCode)) {
return DependResult.FAILED;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
}
}
logger.nfo("The dependTasks of task all success, currentTaskCode: {}, dependTaskCodes: {}",
taskCode, Arrays.toStrng(completeTaskMap.keySet().toArray()));
return DependResult.SUCCESS;
}
/**
* Ths functon s specally used to handle the dependency stuaton where the parent node s a prohbted node.
* When the parent node s a forbdden node, the dependency relatonshp should contnue to be traced
*
* @param taskCode taskCode
* @param ndrectDepCodeLst All ndrectly dependent nodes
*/
prvate vod setIndrectDepLst(Strng taskCode, Lst<Strng> ndrectDepCodeLst) {
TaskNode taskNode = dag.getNode(taskCode);
Lst<Strng> depCodeLst = taskNode.getDepLst();
for (Strng depsNode : depCodeLst) {
f (forbddenTaskMap.contansKey(Long.parseLong(depsNode))) {
setIndrectDepLst(depsNode, ndrectDepCodeLst);
} else {
ndrectDepCodeLst.add(depsNode);
}
}
}
/**
* depend node s completed, but here need check the condton task branch s the next node
*/
prvate boolean dependTaskSuccess(Strng dependNodeName, Strng nextNodeName) {
f (dag.getNode(dependNodeName).sCondtonsTask()) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
Lst<Strng> nextTaskLst =
DagHelper.parseCondtonTask(dependNodeName, skpTaskNodeMap, dag, getCompleteTaskInstanceMap());
f (!nextTaskLst.contans(nextNodeName)) {
logger.nfo(
"DependTask s a condton task, and ts next condton branch does not hava current task, " +
"dependTaskCode: {}, currentTaskCode: {}",
dependNodeName, nextNodeName);
return false;
}
} else {
long taskCode = Long.parseLong(dependNodeName);
Integer taskInstanceId = completeTaskMap.get(taskCode);
TaskExecutonStatus depTaskState = taskInstanceMap.get(taskInstanceId).getState();
return !depTaskState.sFalure();
}
return true;
}
/**
* query task nstance by complete state
*
* @param state state
* @return task nstance lst
*/
prvate Lst<TaskInstance> getCompleteTaskByState(TaskExecutonStatus state) {
Lst<TaskInstance> resultLst = new ArrayLst<>();
for (Integer taskInstanceId : completeTaskMap.values()) {
TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId);
f (taskInstance != null && taskInstance.getState() == state) {
resultLst.add(taskInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
}
return resultLst;
}
/**
* where there are ongong tasks
*
* @param state state
* @return ExecutonStatus
*/
prvate WorkflowExecutonStatus runnngState(WorkflowExecutonStatus state) {
f (state == WorkflowExecutonStatus.READY_STOP || state == WorkflowExecutonStatus.READY_PAUSE
|| state == WorkflowExecutonStatus.READY_BLOCK ||
state == WorkflowExecutonStatus.DELAY_EXECUTION) {
return state;
} else {
return WorkflowExecutonStatus.RUNNING_EXECUTION;
}
}
/**
* exsts falure task,contans submt falure、dependency falure,execute falure(retry after)
*
* @return Boolean whether has faled task
*/
prvate boolean hasFaledTask() {
f (ths.taskFaledSubmt) {
return true;
}
f (ths.errorTaskMap.sze() > 0) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
return true;
}
return ths.dependFaledTaskSet.sze() > 0;
}
/**
* process nstance falure
*
* @return Boolean whether process nstance faled
*/
prvate boolean processFaled() {
f (hasFaledTask()) {
logger.nfo("The current process has faled task, the current process faled");
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
return true;
}
f (processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) {
return readyToSubmtTaskQueue.sze() == 0 && actveTaskProcessorMaps.sze() == 0
&& watToRetryTaskInstanceMap.sze() == 0;
}
}
return false;
}
/**
* prepare for pause
* 1,faled retry task n the preparaton queue , returns to falure drectly
* 2,exsts pause task,complement not completed, pendng submsson of tasks, return to suspenson
* 3,success
*
* @return ExecutonStatus
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
prvate WorkflowExecutonStatus processReadyPause() {
f (hasRetryTaskInStandBy()) {
return WorkflowExecutonStatus.FAILURE;
}
Lst<TaskInstance> pauseLst = getCompleteTaskByState(TaskExecutonStatus.PAUSE);
f (CollectonUtls.sNotEmpty(pauseLst) || processInstance.sBlocked() || !sComplementEnd()
|| readyToSubmtTaskQueue.sze() > 0) {
return WorkflowExecutonStatus.PAUSE;
} else {
return WorkflowExecutonStatus.SUCCESS;
}
}
/**
* prepare for block
* f process has tasks stll runnng, pause them
* f readyToSubmtTaskQueue s not empty, kll them
* else return block status drectly
*
* @return ExecutonStatus
*/
prvate WorkflowExecutonStatus processReadyBlock() {
f (actveTaskProcessorMaps.sze() > 0) {
for (ITaskProcessor taskProcessor : actveTaskProcessorMaps.values()) {
f (!TASK_TYPE_BLOCKING.equals(taskProcessor.getType())) {
taskProcessor.acton(TaskActon.PAUSE);
}
}
}
f (readyToSubmtTaskQueue.sze() > 0) {
for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext();) {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
ter.next().setState(TaskExecutonStatus.PAUSE);
}
}
return WorkflowExecutonStatus.BLOCK;
}
/**
* generate the latest process nstance status by the tasks state
*
* @return process nstance executon status
*/
prvate WorkflowExecutonStatus getProcessInstanceState(ProcessInstance nstance) {
WorkflowExecutonStatus state = nstance.getState();
f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) {
// actve
WorkflowExecutonStatus executonStatus = runnngState(state);
logger.nfo("The workflowInstance has task runnng, the workflowInstance status s {}", executonStatus);
return executonStatus;
}
// block
f (state == WorkflowExecutonStatus.READY_BLOCK) {
WorkflowExecutonStatus executonStatus = processReadyBlock();
logger.nfo("The workflowInstance s ready to block, the workflowInstance status s {}", executonStatus);
return executonStatus;
}
// pause
f (state == WorkflowExecutonStatus.READY_PAUSE) {
WorkflowExecutonStatus executonStatus = processReadyPause();
logger.nfo("The workflowInstance s ready to pause, the workflow status s {}", executonStatus);
return executonStatus;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
// stop
f (state == WorkflowExecutonStatus.READY_STOP) {
Lst<TaskInstance> kllLst = getCompleteTaskByState(TaskExecutonStatus.KILL);
Lst<TaskInstance> falLst = getCompleteTaskByState(TaskExecutonStatus.FAILURE);
WorkflowExecutonStatus executonStatus;
f (CollectonUtls.sNotEmpty(kllLst) || CollectonUtls.sNotEmpty(falLst) || !sComplementEnd()) {
executonStatus = WorkflowExecutonStatus.STOP;
} else {
executonStatus = WorkflowExecutonStatus.SUCCESS;
}
logger.nfo("The workflowInstance s ready to stop, the workflow status s {}", executonStatus);
return executonStatus;
}
// process falure
f (processFaled()) {
logger.nfo("The workflowInstance s faled, the workflow status s {}", WorkflowExecutonStatus.FAILURE);
return WorkflowExecutonStatus.FAILURE;
}
// success
f (state == WorkflowExecutonStatus.RUNNING_EXECUTION) {
Lst<TaskInstance> kllTasks = getCompleteTaskByState(TaskExecutonStatus.KILL);
f (readyToSubmtTaskQueue.sze() > 0 || watToRetryTaskInstanceMap.sze() > 0) {
// tasks c
return WorkflowExecutonStatus.RUNNING_EXECUTION;
} else f (CollectonUtls.sNotEmpty(kllTasks)) {
// tasks m
return WorkflowExecutonStatus.FAILURE;
} else {
// f the
return WorkflowExecutonStatus.SUCCESS;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
}
return state;
}
/**
* whether complement end
*
* @return Boolean whether s complement end
*/
prvate boolean sComplementEnd() {
f (!processInstance.sComplementData()) {
return true;
}
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
Date endTme = DateUtls.strngToDate(cmdParam.get(CMD_PARAM_COMPLEMENT_DATA_END_DATE));
return processInstance.getScheduleTme().equals(endTme);
}
/**
* updateProcessInstance process nstance state
* after each batch of tasks s executed, of the process nstance s updated
*/
prvate vod updateProcessInstanceState() throws StateEventHandleExcepton {
WorkflowExecutonStatus state = getProcessInstanceState(processInstance);
f (processInstance.getState() != state) {
logger.nfo("Update workflowInstance states, orgn state: {}, target state: {}",
processInstance.getState(),
state);
updateWorkflowInstanceStatesToDB(state);
WorkflowStateEvent stateEvent = WorkflowStateEvent.bulder()
.processInstanceId(processInstance.getId())
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
.status(processInstance.getState())
.type(StateEventType.PROCESS_STATE_CHANGE)
.buld();
// replace
ths.stateEvents.add(stateEvent);
} else {
logger.nfo("There s no need to update the workflow nstance state, orgn state: {}, target state: {}",
processInstance.getState(),
state);
}
}
/**
* stateEvent's executon status as process nstance state
*/
publc vod updateProcessInstanceState(WorkflowStateEvent stateEvent) throws StateEventHandleExcepton {
WorkflowExecutonStatus state = stateEvent.getStatus();
updateWorkflowInstanceStatesToDB(state);
}
prvate vod updateWorkflowInstanceStatesToDB(WorkflowExecutonStatus newStates) throws StateEventHandleExcepton {
WorkflowExecutonStatus orgnStates = processInstance.getState();
f (orgnStates != newStates) {
logger.nfo("Begn to update workflow nstance state , state wll change from {} to {}",
orgnStates,
newStates);
processInstance.setStateWthDesc(newStates, "update by workflow executor");
f (newStates.sFnshed()) {
processInstance.setEndTme(new Date());
}
try {
processInstanceDao.updateProcessInstance(processInstance);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
} catch (Excepton ex) {
// recover
processInstance.setStateWthDesc(orgnStates, "recover state by DB error");
processInstance.setEndTme(null);
throw new StateEventHandleExcepton("Update process nstance status to DB error", ex);
}
}
}
/**
* get task dependency result
*
* @param taskInstance task nstance
* @return DependResult
*/
prvate DependResult getDependResultForTask(TaskInstance taskInstance) {
return sTaskDepsComplete(Long.toStrng(taskInstance.getTaskCode()));
}
/**
* add task to standby lst
*
* @param taskInstance task nstance
*/
publc vod addTaskToStandByLst(TaskInstance taskInstance) {
f (readyToSubmtTaskQueue.contans(taskInstance)) {
logger.warn("Task already exsts n ready submt queue, no need to add agan, task code:{}",
taskInstance.getTaskCode());
return;
}
logger.nfo("Add task to stand by lst, task name:{}, task d:{}, task code:{}",
taskInstance.getName(),
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
taskInstance.getId(),
taskInstance.getTaskCode());
TaskMetrcs.ncTaskInstanceByState("submt");
readyToSubmtTaskQueue.put(taskInstance);
}
/**
* remove task from stand by lst
*
* @param taskInstance task nstance
*/
prvate boolean removeTaskFromStandbyLst(TaskInstance taskInstance) {
return readyToSubmtTaskQueue.remove(taskInstance);
}
/**
* has retry task n standby
*
* @return Boolean whether has retry task n standby
*/
prvate boolean hasRetryTaskInStandBy() {
for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext();) {
f (ter.next().getState().sFalure()) {
return true;
}
}
return false;
}
/**
* close the on gong tasks
*/
publc vod kllAllTasks() {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo("kll called on process nstance d: {}, num: {}",
processInstance.getId(),
actveTaskProcessorMaps.sze());
f (readyToSubmtTaskQueue.sze() > 0) {
readyToSubmtTaskQueue.clear();
}
for (long taskCode : actveTaskProcessorMaps.keySet()) {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode);
Integer taskInstanceId = valdTaskMap.get(taskCode);
f (taskInstanceId == null || taskInstanceId.equals(0)) {
contnue;
}
TaskInstance taskInstance = taskInstanceDao.fndTaskInstanceById(taskInstanceId);
f (taskInstance == null || taskInstance.getState().sFnshed()) {
contnue;
}
taskProcessor.acton(TaskActon.STOP);
f (taskProcessor.taskInstance().getState().sFnshed()) {
TaskStateEvent taskStateEvent = TaskStateEvent.bulder()
.processInstanceId(processInstance.getId())
.taskInstanceId(taskInstance.getId())
.status(taskProcessor.taskInstance().getState())
.type(StateEventType.TASK_STATE_CHANGE)
.buld();
ths.addStateEvent(taskStateEvent);
}
}
}
publc boolean workFlowFnsh() {
return ths.processInstance.getState().sFnshed();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* handlng the lst of tasks to be submtted
*/
publc vod submtStandByTask() throws StateEventHandleExcepton {
nt length = readyToSubmtTaskQueue.sze();
for (nt = 0; < length; ++) {
TaskInstance task = readyToSubmtTaskQueue.peek();
f (task == null) {
contnue;
}
// stop ta
f (task.taskCanRetry()) {
TaskInstance retryTask = taskInstanceDao.fndTaskInstanceById(task.getId());
f (retryTask != null && retryTask.getState().sForceSuccess()) {
task.setState(retryTask.getState());
logger.nfo(
"Task {} has been forced success, put t nto complete task lst and stop retryng, taskInstanceId: {}",
task.getName(), task.getId());
removeTaskFromStandbyLst(task);
completeTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
submtPostNode(Long.toStrng(task.getTaskCode()));
contnue;
}
}
// nt va
f (task.sFrstRun()) {
// get pre
Set<Strng> preTask = dag.getPrevousNodes(Long.toStrng(task.getTaskCode()));
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
getPreVarPool(task, preTask);
}
DependResult dependResult = getDependResultForTask(task);
f (DependResult.SUCCESS == dependResult) {
logger.nfo("The dependResult of task {} s success, so ready to submt to execute", task.getName());
Optonal<TaskInstance> taskInstanceOptonal = submtTaskExec(task);
f (!taskInstanceOptonal.sPresent()) {
ths.taskFaledSubmt = true;
// Remove
f (!removeTaskFromStandbyLst(task)) {
logger.error(
"Task submt faled, remove from standby lst faled, workflowInstanceId: {}, taskCode: {}",
processInstance.getId(),
task.getTaskCode());
}
completeTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
errorTaskMap.put(task.getTaskCode(), task.getId());
actveTaskProcessorMaps.remove(task.getTaskCode());
logger.error("Task submtted faled, workflowInstanceId: {}, taskInstanceId: {}, taskCode: {}",
task.getProcessInstanceId(),
task.getId(),
task.getTaskCode());
} else {
removeTaskFromStandbyLst(task);
}
} else f (DependResult.FAILED == dependResult) {
// f the
dependFaledTaskSet.add(task.getTaskCode());
removeTaskFromStandbyLst(task);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
logger.nfo("Task dependent result s faled, taskInstanceId:{} depend result : {}", task.getId(),
dependResult);
} else f (DependResult.NON_EXEC == dependResult) {
// for som
removeTaskFromStandbyLst(task);
logger.nfo("Remove task due to depend result not executed, taskInstanceId:{} depend result : {}",
task.getId(), dependResult);
}
}
}
/**
* Get start task nstance lst from recover
*
* @param cmdParam command param
* @return task nstance lst
*/
protected Lst<TaskInstance> getRecoverTaskInstanceLst(Strng cmdParam) {
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
// todo: Can we use a better way to set the recover taskInstanceId lst? rather then use the cmdParam
f (paramMap != null && paramMap.contansKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) {
Lst<Integer> startTaskInstanceIds = Arrays.stream(paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING)
.splt(COMMA))
.flter(StrngUtls::sNotEmpty)
.map(Integer::valueOf)
.collect(Collectors.toLst());
f (CollectonUtls.sNotEmpty(startTaskInstanceIds)) {
return taskInstanceDao.fndTaskInstanceByIdLst(startTaskInstanceIds);
}
}
return Collectons.emptyLst();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* parse "StartNodeNameLst" from cmd param
*
* @param cmdParam command param
* @return start node name lst
*/
prvate Lst<Strng> parseStartNodeName(Strng cmdParam) {
Lst<Strng> startNodeNameLst = new ArrayLst<>();
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
f (paramMap == null) {
return startNodeNameLst;
}
f (paramMap.contansKey(CMD_PARAM_START_NODES)) {
startNodeNameLst = Arrays.asLst(paramMap.get(CMD_PARAM_START_NODES).splt(Constants.COMMA));
}
return startNodeNameLst;
}
/**
* generate start node code lst from parsng command param;
* f "StartNodeIdLst" exsts n command param, return StartNodeIdLst
*
* @return recovery node code lst
*/
prvate Lst<Strng> getRecoveryNodeCodeLst(Lst<TaskInstance> recoverNodeLst) {
Lst<Strng> recoveryNodeCodeLst = new ArrayLst<>();
f (CollectonUtls.sNotEmpty(recoverNodeLst)) {
for (TaskInstance task : recoverNodeLst) {
recoveryNodeCodeLst.add(Long.toStrng(task.getTaskCode()));
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
return recoveryNodeCodeLst;
}
/**
* generate flow dag
*
* @param totalTaskNodeLst total task node lst
* @param startNodeNameLst start node name lst
* @param recoveryNodeCodeLst recovery node code lst
* @param depNodeType depend node type
* @return ProcessDag process dag
* @throws Excepton excepton
*/
publc ProcessDag generateFlowDag(Lst<TaskNode> totalTaskNodeLst,
Lst<Strng> startNodeNameLst,
Lst<Strng> recoveryNodeCodeLst,
TaskDependType depNodeType) throws Excepton {
return DagHelper.generateFlowDag(totalTaskNodeLst, startNodeNameLst, recoveryNodeCodeLst, depNodeType);
}
/**
* check task queue
*/
prvate boolean checkTaskQueue() {
AtomcBoolean result = new AtomcBoolean(false);
taskInstanceMap.forEach((d, taskInstance) -> {
f (taskInstance != null && taskInstance.getTaskGroupId() > 0) {
result.set(true);
}
});
return result.get();
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
/**
* s new process nstance
*/
prvate boolean sNewProcessInstance() {
f (Flag.YES.equals(processInstance.getRecovery())) {
logger.nfo("Ths workInstance wll be recover by ths executon");
return false;
}
f (WorkflowExecutonStatus.RUNNING_EXECUTION == processInstance.getState()
&& processInstance.getRunTmes() == 1) {
return true;
}
logger.nfo(
"The workflowInstance has been executed before, ths executon s to reRun, processInstance status: {}, runTmes: {}",
processInstance.getState(),
processInstance.getRunTmes());
return false;
}
publc vod resubmt(long taskCode) throws Excepton {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode);
f (taskProcessor != null) {
taskProcessor.acton(TaskActon.RESUBMIT);
logger.debug("RESUBMIT: task code:{}", taskCode);
} else {
throw new Excepton("resubmt error, taskProcessor s null, task code: " + taskCode);
}
}
publc Map<Long, Integer> getCompleteTaskMap() {
return completeTaskMap;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
publc Map<Long, ITaskProcessor> getActveTaskProcessMap() {
return actveTaskProcessorMaps;
}
publc Map<Long, TaskInstance> getWatToRetryTaskInstanceMap() {
return watToRetryTaskInstanceMap;
}
prvate vod setGlobalParamIfCommanded(ProcessDefnton processDefnton, Map<Strng, Strng> cmdParam) {
// get start params from command param
Map<Strng, Strng> startParamMap = new HashMap<>();
f (cmdParam.contansKey(CMD_PARAM_START_PARAMS)) {
Strng startParamJson = cmdParam.get(CMD_PARAM_START_PARAMS);
startParamMap = JSONUtls.toMap(startParamJson);
}
Map<Strng, Strng> fatherParamMap = new HashMap<>();
f (cmdParam.contansKey(CMD_PARAM_FATHER_PARAMS)) {
Strng fatherParamJson = cmdParam.get(CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtls.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
// set start param nto global params
Map<Strng, Strng> globalMap = processDefnton.getGlobalParamMap();
Lst<Property> globalParamLst = processDefnton.getGlobalParamLst();
f (startParamMap.sze() > 0 && globalMap != null) {
// start p
for (Map.Entry<Strng, Strng> param : globalMap.entrySet()) {
Strng val = startParamMap.get(param.getKey());
f (val != null) {
param.setValue(val);
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
}
// start p
for (Map.Entry<Strng, Strng> startParam : startParamMap.entrySet()) {
f (!globalMap.contansKey(startParam.getKey())) {
globalMap.put(startParam.getKey(), startParam.getValue());
globalParamLst.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue()));
}
}
}
}
/**
* clear related data f command of process nstance s EXECUTE_TASK
* 1. fnd all task code from sub dag (only contans related task)
* 2. set the flag of tasks to Flag.NO
* 3. clear varPool data from re-execute task nstance n process nstance
* 4. remove related task nstance from taskInstanceMap, completeTaskMap, valdTaskMap, errorTaskMap
*
* @return task nstance
*/
protected vod clearDataIfExecuteTask() {
// only clear data f command s EXECUTE_TASK
f (!processInstance.getCommandType().equals(CommandType.EXECUTE_TASK)) {
return;
}
// Records the key of varPool data to be removed
Set<Strng> taskCodesStrng = dag.getAllNodesLst();
Lst<TaskInstance> removeTaskInstances = new ArrayLst<>();
for (Strng taskCodeStrng : taskCodesStrng) {
long taskCode = Long.parseLong(taskCodeStrng);
TaskInstance taskInstance;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
f (valdTaskMap.contansKey(taskCode)) {
taskInstance = taskInstanceMap.get(valdTaskMap.get(taskCode));
} else {
taskInstance = taskInstanceDao.fndTaskByInstanceIdAndCode(processInstance.getId(), taskCode);
}
f (taskInstance == null) {
contnue;
}
removeTaskInstances.add(taskInstance);
}
for (TaskInstance taskInstance : removeTaskInstances) {
taskInstance.setFlag(Flag.NO);
taskInstanceDao.updateTaskInstance(taskInstance);
}
Set<Strng> removeSet = new HashSet<>();
for (TaskInstance taskInstance : removeTaskInstances) {
Strng taskVarPool = taskInstance.getVarPool();
f (StrngUtls.sNotEmpty(taskVarPool)) {
Lst<Property> propertes = JSONUtls.toLst(taskVarPool, Property.class);
Lst<Strng> keys = propertes.stream()
.flter(property -> property.getDrect().equals(Drect.OUT))
.map(property -> Strng.format("%s_%s", property.getProp(), property.getType()))
.collect(Collectors.toLst());
removeSet.addAll(keys);
}
}
// remove varPool data and update process nstance
// TODO: we can remove ths snppet f : we get varPool from pre taskInstance nstead of process nstance when
// task can not get pre task from ncomplete dag
Lst<Property> processPropertes = JSONUtls.toLst(processInstance.getVarPool(), Property.class);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,140 |
[Improvement][Master] Get varPool from upstream tasks instead of processInstance if dag is incomplete
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
In restarting failed task, dag is incomplete, the failed task can not get preTask from dag. But in `getPreVarPool ` method, our implement method is to get the `varPool` from `processInstance` because preTask is empty. This will lead to some unknown errors. For example, ` varPool` in `processInstance` is updated by something else.
I think we can find the actual upstream tasks from the database or other places.
```java
public void getPreVarPool(TaskInstance taskInstance, Set<String> preTask) {
Map<String, Property> allProperty = new HashMap<>();
Map<String, TaskInstance> allTaskInstance = new HashMap<>();
if (CollectionUtils.isNotEmpty(preTask)) {
for (String preTaskCode : preTask) {
Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode));
if (taskId == null) {
continue;
}
TaskInstance preTaskInstance = taskInstanceMap.get(taskId);
if (preTaskInstance == null) {
continue;
}
String preVarPool = preTaskInstance.getVarPool();
if (StringUtils.isNotEmpty(preVarPool)) {
List<Property> properties = JSONUtils.toList(preVarPool, Property.class);
for (Property info : properties) {
setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, info);
}
}
}
if (allProperty.size() > 0) {
taskInstance.setVarPool(JSONUtils.toJsonString(allProperty.values()));
}
} else {
if (StringUtils.isNotEmpty(processInstance.getVarPool())) {
taskInstance.setVarPool(processInstance.getVarPool());
}
}
}
```
### Are you willing to submit a PR?
- [x] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13140
|
https://github.com/apache/dolphinscheduler/pull/13255
|
14ec4a239813be6dfeedb919f5fbff28eb5ec9dc
|
2e95a020abb89f1958870bd79dbca41d71adc9c2
| 2022-12-09T01:56:00Z |
java
| 2022-12-22T07:51:40Z |
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java
|
processPropertes = processPropertes.stream()
.flter(property -> !(property.getDrect().equals(Drect.IN)
&& removeSet.contans(Strng.format("%s_%s", property.getProp(), property.getType()))))
.collect(Collectors.toLst());
processInstance.setVarPool(JSONUtls.toJsonStrng(processPropertes));
processInstanceDao.updateProcessInstance(processInstance);
// remove task nstance from taskInstanceMap, completeTaskMap, valdTaskMap, errorTaskMap
taskInstanceMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getValue().getTaskCode())));
completeTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
valdTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
errorTaskMap.entrySet().removeIf(map -> dag.contansNode(Long.toStrng(map.getKey())));
}
prvate vod saveCacheTaskInstance(TaskInstance taskInstance) {
Par<Integer, Strng> taskIdAndCacheKey = TaskCacheUtls.revertCacheKey(taskInstance.getCacheKey());
Integer taskId = taskIdAndCacheKey.getLeft();
f (taskId.equals(taskInstance.getId())) {
taskInstance.setCacheKey(taskIdAndCacheKey.getRght());
try {
taskInstanceDao.updateTaskInstance(taskInstance);
} catch (Excepton e) {
logger.error("update task nstance cache key faled", e);
}
}
}
prvate enum WorkflowRunnableStatus {
CREATED, INITIALIZE_DAG, INITIALIZE_QUEUE, STARTED,
;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,263 |
[Bug] [Task Plugin] Synchronization status failure in SageMaker task
|
### 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
Can not stop the task in DolphinScheduler when stopping the task in Sagemaker platform
### What you expected to happen
empty
### How to reproduce
empty
### Anything else
empty
### Version
3.1.x
### 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/13263
|
https://github.com/apache/dolphinscheduler/pull/13264
|
4e09bacb17c5a5d554815be03916960f354d45a1
|
df491f78cc0830b7fe19cb01581673d5c5dc9cf0
| 2022-12-22T10:18:18Z |
java
| 2022-12-22T12:17:17Z |
dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/PipelineUtils.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
| 13,263 |
[Bug] [Task Plugin] Synchronization status failure in SageMaker task
|
### 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
Can not stop the task in DolphinScheduler when stopping the task in Sagemaker platform
### What you expected to happen
empty
### How to reproduce
empty
### Anything else
empty
### Version
3.1.x
### 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/13263
|
https://github.com/apache/dolphinscheduler/pull/13264
|
4e09bacb17c5a5d554815be03916960f354d45a1
|
df491f78cc0830b7fe19cb01581673d5c5dc9cf0
| 2022-12-22T10:18:18Z |
java
| 2022-12-22T12:17:17Z |
dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/PipelineUtils.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.plugin.task.sagemaker;
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.plugin.task.api.TaskConstants;
import java.util.Collections;
import java.util.List;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.amazonaws.services.sagemaker.AmazonSageMaker;
import com.amazonaws.services.sagemaker.model.DescribePipelineExecutionRequest;
import com.amazonaws.services.sagemaker.model.DescribePipelineExecutionResult;
import com.amazonaws.services.sagemaker.model.ListPipelineExecutionStepsRequest;
import com.amazonaws.services.sagemaker.model.ListPipelineExecutionStepsResult;
import com.amazonaws.services.sagemaker.model.PipelineExecutionStep;
import com.amazonaws.services.sagemaker.model.StartPipelineExecutionRequest;
import com.amazonaws.services.sagemaker.model.StartPipelineExecutionResult;
import com.amazonaws.services.sagemaker.model.StopPipelineExecutionRequest;
import com.amazonaws.services.sagemaker.model.StopPipelineExecutionResult;
public class PipelineUtils {
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,263 |
[Bug] [Task Plugin] Synchronization status failure in SageMaker task
|
### 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
Can not stop the task in DolphinScheduler when stopping the task in Sagemaker platform
### What you expected to happen
empty
### How to reproduce
empty
### Anything else
empty
### Version
3.1.x
### 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/13263
|
https://github.com/apache/dolphinscheduler/pull/13264
|
4e09bacb17c5a5d554815be03916960f354d45a1
|
df491f78cc0830b7fe19cb01581673d5c5dc9cf0
| 2022-12-22T10:18:18Z |
java
| 2022-12-22T12:17:17Z |
dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/PipelineUtils.java
|
protected final Logger logger =
LoggerFactory.getLogger(String.format(TaskConstants.TASK_LOG_LOGGER_NAME_FORMAT, getClass()));
private static final String EXECUTING = "Executing";
private static final String SUCCEEDED = "Succeeded";
public PipelineId startPipelineExecution(AmazonSageMaker client, StartPipelineExecutionRequest request) {
StartPipelineExecutionResult result = client.startPipelineExecution(request);
String pipelineExecutionArn = result.getPipelineExecutionArn();
String clientRequestToken = request.getClientRequestToken();
logger.info("Start success, pipeline: {}, token: {}", pipelineExecutionArn, clientRequestToken);
return new PipelineId(pipelineExecutionArn, clientRequestToken);
}
public void stopPipelineExecution(AmazonSageMaker client, PipelineId pipelineId) {
StopPipelineExecutionRequest request = new StopPipelineExecutionRequest();
request.setPipelineExecutionArn(pipelineId.getPipelineExecutionArn());
request.setClientRequestToken(pipelineId.getClientRequestToken());
StopPipelineExecutionResult result = client.stopPipelineExecution(request);
logger.info("Stop pipeline: {} success", result.getPipelineExecutionArn());
}
public int checkPipelineExecutionStatus(AmazonSageMaker client, PipelineId pipelineId) {
String pipelineStatus = describePipelineExecution(client, pipelineId);
while (EXECUTING.equals(pipelineStatus)) {
logger.info("check Pipeline Steps running");
listPipelineExecutionSteps(client, pipelineId);
ThreadUtils.sleep(SagemakerConstants.CHECK_PIPELINE_EXECUTION_STATUS_INTERVAL);
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,263 |
[Bug] [Task Plugin] Synchronization status failure in SageMaker task
|
### 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
Can not stop the task in DolphinScheduler when stopping the task in Sagemaker platform
### What you expected to happen
empty
### How to reproduce
empty
### Anything else
empty
### Version
3.1.x
### 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/13263
|
https://github.com/apache/dolphinscheduler/pull/13264
|
4e09bacb17c5a5d554815be03916960f354d45a1
|
df491f78cc0830b7fe19cb01581673d5c5dc9cf0
| 2022-12-22T10:18:18Z |
java
| 2022-12-22T12:17:17Z |
dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/PipelineUtils.java
|
describePipelineExecution(client, pipelineId);
}
int exitStatusCode = TaskConstants.EXIT_CODE_FAILURE;
if (SUCCEEDED.equals(pipelineStatus)) {
exitStatusCode = TaskConstants.EXIT_CODE_SUCCESS;
}
logger.info("PipelineExecutionStatus : {}, exitStatusCode: {}", pipelineStatus, exitStatusCode);
return exitStatusCode;
}
private String describePipelineExecution(AmazonSageMaker client, PipelineId pipelineId) {
DescribePipelineExecutionRequest request = new DescribePipelineExecutionRequest();
request.setPipelineExecutionArn(pipelineId.getPipelineExecutionArn());
DescribePipelineExecutionResult result = client.describePipelineExecution(request);
logger.info("PipelineExecutionStatus: {}", result.getPipelineExecutionStatus());
return result.getPipelineExecutionStatus();
}
private void listPipelineExecutionSteps(AmazonSageMaker client, PipelineId pipelineId) {
ListPipelineExecutionStepsRequest request = new ListPipelineExecutionStepsRequest();
request.setPipelineExecutionArn(pipelineId.getPipelineExecutionArn());
request.setMaxResults(SagemakerConstants.PIPELINE_MAX_RESULTS);
ListPipelineExecutionStepsResult result = client.listPipelineExecutionSteps(request);
List<PipelineExecutionStep> steps = result.getPipelineExecutionSteps();
Collections.reverse(steps);
logger.info("pipelineStepsStatus: ");
for (PipelineExecutionStep step : steps) {
String stepMessage = step.toString();
logger.info(stepMessage);
}
}
@Data
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,263 |
[Bug] [Task Plugin] Synchronization status failure in SageMaker task
|
### 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
Can not stop the task in DolphinScheduler when stopping the task in Sagemaker platform
### What you expected to happen
empty
### How to reproduce
empty
### Anything else
empty
### Version
3.1.x
### 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/13263
|
https://github.com/apache/dolphinscheduler/pull/13264
|
4e09bacb17c5a5d554815be03916960f354d45a1
|
df491f78cc0830b7fe19cb01581673d5c5dc9cf0
| 2022-12-22T10:18:18Z |
java
| 2022-12-22T12:17:17Z |
dolphinscheduler-task-plugin/dolphinscheduler-task-sagemaker/src/main/java/org/apache/dolphinscheduler/plugin/task/sagemaker/PipelineUtils.java
|
@AllArgsConstructor
@NoArgsConstructor
public static class PipelineId {
private String pipelineExecutionArn;
private String clientRequestToken;
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/ScheduleVo.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.vo;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Priority;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import java.time.ZoneId;
import java.util.Date;
import lombok.Data;
@Data
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/ScheduleVo.java
|
public class ScheduleVo {
private int id;
/**
* process definition code
*/
private long processDefinitionCode;
/**
* process definition name
*/
private String processDefinitionName;
/**
* project name
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/ScheduleVo.java
|
*/
private String projectName;
/**
* schedule description
*/
private String definitionDescription;
/**
* schedule start time
*/
private String startTime;
/**
* schedule end time
*/
private String endTime;
/**
* timezoneId
* <p>see {@link java.util.TimeZone#getTimeZone(String)}
*/
private String timezoneId;
/**
* crontab expression
*/
private String crontab;
/**
* failure strategy
*/
private FailureStrategy failureStrategy;
/**
* warning type
*/
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/ScheduleVo.java
|
private WarningType warningType;
/**
* create time
*/
private Date createTime;
/**
* update time
*/
private Date updateTime;
/**
* created user id
*/
private int userId;
/**
* created user name
*/
private String userName;
/**
* release state
*/
private ReleaseState releaseState;
/**
* warning group id
*/
private int warningGroupId;
/**
* process instance priority
*/
private Priority processInstancePriority;
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/vo/ScheduleVo.java
|
* worker group
*/
private String workerGroup;
/**
* environment code
*/
private Long environmentCode;
public ScheduleVo(Schedule schedule) {
this.setId(schedule.getId());
this.setCrontab(schedule.getCrontab());
this.setProjectName(schedule.getProjectName());
this.setUserName(schedule.getUserName());
this.setWorkerGroup(schedule.getWorkerGroup());
this.setWarningType(schedule.getWarningType());
this.setWarningGroupId(schedule.getWarningGroupId());
this.setUserId(schedule.getUserId());
this.setCreateTime(schedule.getCreateTime());
this.setUpdateTime(schedule.getUpdateTime());
this.setTimezoneId(schedule.getTimezoneId());
this.setReleaseState(schedule.getReleaseState());
this.setProcessInstancePriority(schedule.getProcessInstancePriority());
this.setProcessDefinitionName(schedule.getProcessDefinitionName());
this.setProcessDefinitionCode(schedule.getProcessDefinitionCode());
this.setFailureStrategy(schedule.getFailureStrategy());
this.setEnvironmentCode(schedule.getEnvironmentCode());
this.setStartTime(DateUtils.dateToString(schedule.getStartTime(), ZoneId.systemDefault().getId()));
this.setEndTime(DateUtils.dateToString(schedule.getEndTime(), ZoneId.systemDefault().getId()));
}
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.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.dao.entity;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Priority;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.WarningType;
import java.util.Date;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
@Data
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
|
@TableName("t_ds_schedules")
public class Schedule {
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**
* process definition code
*/
private long processDefinitionCode;
/**
* process definition name
*/
@TableField(exist = false)
private String processDefinitionName;
/**
* project name
*/
@TableField(exist = false)
private String projectName;
/**
* schedule description
*/
@TableField(exist = false)
private String definitionDescription;
/**
* schedule start time
*/
private Date startTime;
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
|
/**
* schedule end time
*/
private Date endTime;
/**
* timezoneId
* <p>see {@link java.util.TimeZone#getTimeZone(String)}
*/
private String timezoneId;
/**
* crontab expression
*/
private String crontab;
/**
* failure strategy
*/
private FailureStrategy failureStrategy;
/**
* warning type
*/
private WarningType warningType;
/**
* create time
*/
private Date createTime;
/**
* update time
*/
private Date updateTime;
/**
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,266 |
[Improvement][UI] Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.
|
### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement.
### Description
Support to display extra columns such as 'Worker Group','Environment Name' and 'Alarm Group' on the page of cron manage.


### Are you willing to submit a PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
|
https://github.com/apache/dolphinscheduler/issues/13266
|
https://github.com/apache/dolphinscheduler/pull/13267
|
fb67b085a352c6d8596e5b9d4b33ef370b604dc5
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
| 2022-12-23T02:59:49Z |
java
| 2022-12-23T07:24:59Z |
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Schedule.java
|
* created user id
*/
private int userId;
/**
* created user name
*/
@TableField(exist = false)
private String userName;
/**
* release state
*/
private ReleaseState releaseState;
/**
* warning group id
*/
private int warningGroupId;
/**
* process instance priority
*/
private Priority processInstancePriority;
/**
* worker group
*/
private String workerGroup;
/**
* environment code
*/
private Long environmentCode;
}
|
closed
|
apache/dolphinscheduler
|
https://github.com/apache/dolphinscheduler
| 13,260 |
[Bug] [API] When querying the list of workflow definitions the api response result lacks the value of user name.
|
### 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 querying the list of workflow definitions the api response result lacks the value of user name.

### What you expected to happen
I expect that the user name of workflow definition can be displayed.
### How to reproduce
1.Visit the workflow definition.
2.Look at the column 'Create User' on the table of workflow definitions.
### 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/13260
|
https://github.com/apache/dolphinscheduler/pull/13261
|
a235d3cd6a0f889b4793f81b07aaa73ba23c2412
|
a98cae70651af32fe83ad7206388b8fcd9698059
| 2022-12-22T09:53:01Z |
java
| 2022-12-23T11:22:08Z |
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
|
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.api.service.impl;
import static java.util.stream.Collectors.toSet;
import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TASK_DEFINITION_MOVE;
import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.VERSION_DELETE;
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.