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 | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | public static final String SUCCEEDED = "SUCCEEDED";
/**
* ENDED
*/
public static final String ENDED = "ENDED";
/**
* NEW
*/
public static final String NEW = "NEW";
/**
* NEW_SAVING
*/
public static final String NEW_SAVING = "NEW_SAVING";
/**
* SUBMITTED
*/
public static final String SUBMITTED = "SUBMITTED";
/**
* FAILED
*/
public static final String FAILED = "FAILED";
/**
* KILLED
*/
public static final String KILLED = "KILLED";
/**
* RUNNING
*/
public static final String RUNNING = "RUNNING";
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | * underline "_"
*/
public static final String UNDERLINE = "_";
/**
* application regex
*/
public static final String APPLICATION_REGEX = "application_\\d+_\\d+";
public static final String PID = SystemUtils.IS_OS_WINDOWS ? "handle" : "pid";
/**
* month_begin
*/
public static final String MONTH_BEGIN = "month_begin";
/**
* add_months
*/
public static final String ADD_MONTHS = "add_months";
/**
* month_end
*/
public static final String MONTH_END = "month_end";
/**
* week_begin
*/
public static final String WEEK_BEGIN = "week_begin";
/**
* week_end
*/
public static final String WEEK_END = "week_end";
/**
* timestamp |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | */
public static final String TIMESTAMP = "timestamp";
public static final char SUBTRACT_CHAR = '-';
public static final char ADD_CHAR = '+';
public static final char MULTIPLY_CHAR = '*';
public static final char DIVISION_CHAR = '/';
public static final char LEFT_BRACE_CHAR = '(';
public static final char RIGHT_BRACE_CHAR = ')';
public static final String ADD_STRING = "+";
public static final String STAR = "*";
public static final String DIVISION_STRING = "/";
public static final String LEFT_BRACE_STRING = "(";
public static final char P = 'P';
public static final char N = 'N';
public static final String SUBTRACT_STRING = "-";
public static final String GLOBAL_PARAMS = "globalParams";
public static final String LOCAL_PARAMS = "localParams";
public static final String SUBPROCESS_INSTANCE_ID = "subProcessInstanceId";
public static final String PROCESS_INSTANCE_STATE = "processInstanceState";
public static final String PARENT_WORKFLOW_INSTANCE = "parentWorkflowInstance";
public static final String CONDITION_RESULT = "conditionResult";
public static final String SWITCH_RESULT = "switchResult";
public static final String WAIT_START_TIMEOUT = "waitStartTimeout";
public static final String DEPENDENCE = "dependence";
public static final String TASK_LIST = "taskList";
public static final String QUEUE = "queue";
public static final String QUEUE_NAME = "queueName";
public static final int LOG_QUERY_SKIP_LINE_NUMBER = 0;
public static final int LOG_QUERY_LIMIT = 4096;
public static final String BLOCKING_CONDITION = "blockingCondition"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | public static final String ALERT_WHEN_BLOCKING = "alertWhenBlocking";
/**
* master/worker server use for zk
*/
public static final String MASTER_TYPE = "master";
public static final String WORKER_TYPE = "worker";
public static final String DELETE_OP = "delete";
public static final String ADD_OP = "add";
public static final String ALIAS = "alias";
public static final String CONTENT = "content";
public static final String DEPENDENT_SPLIT = ":||";
public static final long DEPENDENT_ALL_TASK_CODE = 0;
/**
* preview schedule execute count
*/
public static final int PREVIEW_SCHEDULE_EXECUTE_COUNT = 5;
/**
* kerberos
*/
public static final String KERBEROS = "kerberos";
/**
* kerberos expire time
*/
public static final String KERBEROS_EXPIRE_TIME = "kerberos.expire.time";
/**
* java.security.krb5.conf
*/
public static final String JAVA_SECURITY_KRB5_CONF = "java.security.krb5.conf";
/**
* java.security.krb5.conf.path |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | */
public static final String JAVA_SECURITY_KRB5_CONF_PATH = "java.security.krb5.conf.path";
/**
* hadoop.security.authentication
*/
public static final String HADOOP_SECURITY_AUTHENTICATION = "hadoop.security.authentication";
/**
* hadoop.security.authentication
*/
public static final String HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE = "hadoop.security.authentication.startup.state";
/**
* com.amazonaws.services.s3.enableV4
*/
public static final String AWS_S3_V4 = "com.amazonaws.services.s3.enableV4";
/**
* loginUserFromKeytab user
*/
public static final String LOGIN_USER_KEY_TAB_USERNAME = "login.user.keytab.username";
/**
* loginUserFromKeytab path
*/
public static final String LOGIN_USER_KEY_TAB_PATH = "login.user.keytab.path";
/**
* task log info format
*/
public static final String TASK_LOG_INFO_FORMAT = "TaskLogInfo-%s";
public static final int[] NOT_TERMINATED_STATES = new int[]{
ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
ExecutionStatus.DISPATCH.ordinal(),
ExecutionStatus.RUNNING_EXECUTION.ordinal(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | ExecutionStatus.DELAY_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal(),
ExecutionStatus.NEED_FAULT_TOLERANCE.ordinal(),
ExecutionStatus.WAITING_THREAD.ordinal(),
ExecutionStatus.WAITING_DEPEND.ordinal()
};
public static final int[] RUNNING_PROCESS_STATE = new int[]{
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
ExecutionStatus.DISPATCH.ordinal(),
ExecutionStatus.SERIAL_WAIT.ordinal()
};
/**
* status
*/
public static final String STATUS = "status";
/**
* message
*/
public static final String MSG = "msg";
/**
* data total
*/
public static final String COUNT = "count";
/**
* page size
*/
public static final String PAGE_SIZE = "pageSize";
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | * current page no
*/
public static final String PAGE_NUMBER = "pageNo";
/**
*
*/
public static final String DATA_LIST = "data";
public static final String TOTAL_LIST = "totalList";
public static final String CURRENT_PAGE = "currentPage";
public static final String TOTAL_PAGE = "totalPage";
public static final String TOTAL = "total";
/**
* workflow
*/
public static final String WORKFLOW_LIST = "workFlowList";
public static final String WORKFLOW_RELATION_LIST = "workFlowRelationList";
/**
* session user
*/
public static final String SESSION_USER = "session.user";
public static final String SESSION_ID = "sessionId";
/**
* locale
*/
public static final String LOCALE_LANGUAGE = "language";
/**
* database type
*/
public static final String MYSQL = "MYSQL";
public static final String HIVE = "HIVE"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | public static final String ADDRESS = "address";
public static final String DATABASE = "database";
public static final String OTHER = "other";
public static final String USER = "user";
public static final String JDBC_URL = "jdbcUrl";
/**
* session timeout
*/
public static final int SESSION_TIME_OUT = 7200;
public static final int MAX_FILE_SIZE = 1024 * 1024 * 1024;
public static final String UDF = "UDF";
public static final String CLASS = "class";
/**
* dataSource sensitive param
*/
public static final String DATASOURCE_PASSWORD_REGEX = "(?<=((?i)password((\\\\\":\\\\\")|(=')))).*?(?=((\\\\\")|(')))";
/**
* default worker group
*/
public static final String DEFAULT_WORKER_GROUP = "default";
/**
* authorize writable perm
*/
public static final int AUTHORIZE_WRITABLE_PERM = 7;
/**
* authorize readable perm
*/
public static final int AUTHORIZE_READABLE_PERM = 4;
public static final int NORMAL_NODE_STATUS = 0;
public static final int ABNORMAL_NODE_STATUS = 1; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | public static final int BUSY_NODE_STATUE = 2;
public static final String START_TIME = "start time";
public static final String END_TIME = "end time";
public static final String START_END_DATE = "startDate,endDate";
/**
* system line separator
*/
public static final String SYSTEM_LINE_SEPARATOR = System.getProperty("line.separator");
/**
* datasource encryption salt
*/
public static final String DATASOURCE_ENCRYPTION_SALT_DEFAULT = "!@#$%^&*";
public static final String DATASOURCE_ENCRYPTION_ENABLE = "datasource.encryption.enable";
public static final String DATASOURCE_ENCRYPTION_SALT = "datasource.encryption.salt";
/**
* network interface preferred
*/
public static final String DOLPHIN_SCHEDULER_NETWORK_INTERFACE_PREFERRED = "dolphin.scheduler.network.interface.preferred";
/**
* network IP gets priority, default inner outer
*/
public static final String DOLPHIN_SCHEDULER_NETWORK_PRIORITY_STRATEGY = "dolphin.scheduler.network.priority.strategy";
/**
* exec shell scripts
*/
public static final String SH = "sh";
/**
* pstree, get pud and sub pid
*/
public static final String PSTREE = "pstree"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java | public static final boolean KUBERNETES_MODE = !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_HOST")) && !StringUtils.isEmpty(System.getenv("KUBERNETES_SERVICE_PORT"));
/**
* dry run flag
*/
public static final int DRY_RUN_FLAG_NO = 0;
public static final int DRY_RUN_FLAG_YES = 1;
/**
* data.quality.error.output.path
*/
public static final String DATA_QUALITY_ERROR_OUTPUT_PATH = "data-quality.error.output.path";
public static final String CACHE_KEY_VALUE_ALL = "'all'";
/**
* use for k8s
*/
public static final String NAMESPACE = "namespace";
public static final String K8S = "k8s";
public static final String LIMITS_CPU = "limitsCpu";
public static final String LIMITS_MEMORY = "limitsMemory";
public static final String K8S_LOCAL_TEST_CLUSTER = "ds_null_k8s";
/**
* schedule timezone
*/
public static final String SCHEDULE_TIMEZONE = "schedule_timezone";
public static final int RESOURCE_FULL_NAME_MAX_LENGTH = 128;
/**
* tenant
*/
public static final int TENANT_FULL_NAME_MAX_LENGTH = 30;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | /*
* Lcensed to the Apache Software Foundaton (ASF) under one or more
* 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.CMDPARAM_COMPLEMENT_DATA_END_DATE;
mport statc org.apache.dolphnscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE;
mport statc org.apache.dolphnscheduler.common.Constants.CMD_PARAM_RECOVERY_START_NODE_STRING;
mport statc org.apache.dolphnscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
mport statc org.apache.dolphnscheduler.common.Constants.CMD_PARAM_START_NODES;
mport statc org.apache.dolphnscheduler.common.Constants.DEFAULT_WORKER_GROUP;
mport statc org.apache.dolphnscheduler.plugn.task.ap.TaskConstants.TASK_TYPE_BLOCKING; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | 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;
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.StateEvent;
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.TmeoutFlag;
mport org.apache.dolphnscheduler.common.graph.DAG;
mport org.apache.dolphnscheduler.common.model.TaskNode;
mport org.apache.dolphnscheduler.common.model.TaskNodeRelaton;
mport org.apache.dolphnscheduler.common.process.ProcessDag;
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.common.utls.ParameterUtls;
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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | mport org.apache.dolphnscheduler.dao.utls.DagHelper;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.DependResult;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.Drect;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.ExecutonStatus;
mport org.apache.dolphnscheduler.plugn.task.ap.enums.TaskTmeoutStrategy;
mport org.apache.dolphnscheduler.plugn.task.ap.model.Property;
mport org.apache.dolphnscheduler.plugn.task.ap.parameters.BlockngParameters;
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.metrcs.ProcessInstanceMetrcs;
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.corn.CronUtls;
mport org.apache.dolphnscheduler.servce.process.ProcessServce;
mport org.apache.dolphnscheduler.servce.queue.PeerTaskInstancePrortyQueue;
mport org.apache.commons.collectons.CollectonUtls;
mport org.apache.commons.lang3.StrngUtls;
mport org.apache.commons.lang3.math.NumberUtls;
mport java.utl.ArrayLst;
mport java.utl.Arrays;
mport java.utl.Collecton;
mport java.utl.Date;
mport java.utl.HashMap;
mport java.utl.HashSet;
mport java.utl.Iterator; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | mport java.utl.Lst;
mport java.utl.Map;
mport java.utl.Objects;
mport java.utl.Optonal;
mport java.utl.Set;
mport java.utl.concurrent.ConcurrentHashMap;
mport java.utl.concurrent.ConcurrentLnkedQueue;
mport java.utl.concurrent.atomc.AtomcBoolean;
mport org.slf4j.Logger;
mport org.slf4j.LoggerFactory;
mport com.google.common.collect.Lsts;
/**
* Workflow execute task, used to execute a workflow nstance.
*/
publc class WorkflowExecuteRunnable mplements Runnable {
/**
* logger of WorkflowExecuteThread
*/
prvate statc fnal Logger logger = LoggerFactory.getLogger(WorkflowExecuteRunnable.class);
/**
* master confg
*/
prvate fnal MasterConfg masterConfg;
/**
* process servce
*/
prvate fnal ProcessServce processServce;
/**
* alert manager
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | prvate fnal ProcessAlertManager processAlertManager;
/**
* netty executor manager
*/
prvate fnal NettyExecutorManager nettyExecutorManager;
/**
* process nstance
*/
prvate ProcessInstance processInstance;
/**
* process defnton
*/
prvate ProcessDefnton processDefnton;
/**
* the object of DAG
*/
prvate DAG<Strng, TaskNode, TaskNodeRelaton> dag;
/**
* key of workflow
*/
prvate Strng key;
/**
* start flag, true: start nodes submt completely
*/
prvate boolean sStart = false;
/**
* submt falure nodes
*/
prvate boolean taskFaledSubmt = false;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * 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<>();
/**
* 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 map, taskCode as key, taskId as value
*/
prvate fnal Map<Long, Integer> dependFaledTaskMap = new ConcurrentHashMap<>();
/**
* forbdden task map, code as key
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | 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
*/
prvate Lst<Date> complementLstDate = Lsts.newLnkedLst();
/**
* state event queue
*/
prvate fnal ConcurrentLnkedQueue<StateEvent> stateEvents = new ConcurrentLnkedQueue<>();
/**
* ready to submt task queue
*/
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<>();
/**
* state wheel execute thread
*/
prvate fnal StateWheelExecuteThread stateWheelExecuteThread;
/**
* @param processInstance processInstance
* @param processServce processServce
* @param nettyExecutorManager nettyExecutorManager |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * @param processAlertManager processAlertManager
* @param masterConfg masterConfg
* @param stateWheelExecuteThread stateWheelExecuteThread
*/
publc WorkflowExecuteRunnable(ProcessInstance processInstance
, ProcessServce processServce
, NettyExecutorManager nettyExecutorManager
, ProcessAlertManager processAlertManager
, MasterConfg masterConfg
, StateWheelExecuteThread stateWheelExecuteThread) {
ths.processServce = processServce;
ths.processInstance = processInstance;
ths.masterConfg = masterConfg;
ths.nettyExecutorManager = nettyExecutorManager;
ths.processAlertManager = processAlertManager;
ths.stateWheelExecuteThread = stateWheelExecuteThread;
TaskMetrcs.regsterTaskRunnng(readyToSubmtTaskQueue::sze);
}
/**
* the process start nodes are submtted completely.
*/
publc boolean sStart() {
return ths.sStart;
}
/**
* handle event
*/
publc vod handleEvents() {
f (!sStart) {
return; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
whle (!ths.stateEvents.sEmpty()) {
try {
StateEvent stateEvent = ths.stateEvents.peek();
f (stateEventHandler(stateEvent)) {
ths.stateEvents.remove(stateEvent);
}
} catch (Excepton e) {
logger.error("state handle error:", e);
}
}
}
publc Strng getKey() {
f (StrngUtls.sNotEmpty(key)
|| ths.processDefnton == null) {
return key;
}
key = Strng.format("%d_%d_%d",
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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
publc nt eventSze() {
return ths.stateEvents.sze();
}
publc ProcessInstance getProcessInstance() {
return ths.processInstance;
}
prvate boolean stateEventHandler(StateEvent stateEvent) {
logger.nfo("process event: {}", stateEvent);
f (!checkProcessInstance(stateEvent)) {
return false;
}
boolean result = false;
swtch (stateEvent.getType()) {
case PROCESS_STATE_CHANGE:
measureProcessState(stateEvent);
result = pr
break;
case TASK_STATE_CHANGE:
measureTaskState(stateEvent);
result = taskStateChangeHandler(stateEvent);
break;
case PROCESS_TIMEOUT:
ProcessInstanceMetrcs.ncProcessInstanceTmeout();
result = processTmeout();
break;
case TASK_TIMEOUT:
TaskMetrcs.ncTaskTmeout();
result = taskTmeout(stateEvent);
break; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | case WAIT_TASK_GROUP:
result = checkForceStartAndWakeUp(stateEvent);
break;
case TASK_RETRY:
TaskMetrcs.ncTaskRetry();
result = taskRetryEventHandler(stateEvent);
break;
case PROCESS_BLOCKED:
result = processBlockHandler(stateEvent);
break;
default:
break;
}
f (result) {
ths.stateEvents.remove(stateEvent);
}
return result;
}
prvate boolean checkForceStartAndWakeUp(StateEvent stateEvent) {
TaskGroupQueue taskGroupQueue = ths.processServce.loadTaskGroupQueue(stateEvent.getTaskInstanceId());
f (taskGroupQueue.getForceStart() == Flag.YES.getCode()) {
TaskInstance taskInstance = ths.processServce.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()) {
boolean acqureTaskGroup = processServce.acqureTaskGroupAgan(taskGroupQueue);
f (acqureTaskGroup) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | TaskInstance taskInstance = ths.processServce.fndTaskInstanceById(stateEvent.getTaskInstanceId());
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode());
taskProcessor.acton(TaskActon.DISPATCH);
return true;
}
}
return false;
}
prvate boolean taskTmeout(StateEvent stateEvent) {
f (!checkTaskInstanceByStateEvent(stateEvent)) {
return true;
}
TaskInstance taskInstance = taskInstanceMap.get(stateEvent.getTaskInstanceId());
f (TmeoutFlag.CLOSE == taskInstance.getTaskDefne().getTmeoutFlag()) {
return true;
}
TaskTmeoutStrategy taskTmeoutStrategy = taskInstance.getTaskDefne().getTmeoutNotfyStrategy();
f (TaskTmeoutStrategy.FAILED == taskTmeoutStrategy || TaskTmeoutStrategy.WARNFAILED == taskTmeoutStrategy) {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode());
taskProcessor.acton(TaskActon.TIMEOUT);
}
f (TaskTmeoutStrategy.WARN == taskTmeoutStrategy || TaskTmeoutStrategy.WARNFAILED == taskTmeoutStrategy) {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendTaskTmeoutAlert(processInstance, taskInstance, projectUser);
}
return true;
}
prvate boolean processTmeout() {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
ths.processAlertManager.sendProcessTmeoutAlert(ths.processInstance, projectUser); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | return true;
}
prvate boolean taskStateChangeHandler(StateEvent stateEvent) {
f (!checkTaskInstanceByStateEvent(stateEvent)) {
return true;
}
Optonal<TaskInstance> taskInstanceOptonal = getTaskInstance(stateEvent.getTaskInstanceId());
TaskInstance task = taskInstanceOptonal.orElseThrow(
() -> new RuntmeExcepton("Cannot fnd task nstance by task nstance d: " + stateEvent.getTaskInstanceId()));
f (task.getState() == null) {
logger.error("task state s null, state handler error: {}", stateEvent);
return true;
}
f (task.getState().typeIsFnshed()) {
f (completeTaskMap.contansKey(task.getTaskCode()) && completeTaskMap.get(task.getTaskCode()) == task.getId()) {
return true;
}
taskFnshed(task);
f (task.getTaskGroupId() > 0) {
releaseTaskGroup(task);
}
return true;
}
f (actveTaskProcessorMaps.contansKey(task.getTaskCode())) {
ITaskProcessor TaskProcessor = actveTaskProcessorMaps.get(task.getTaskCode());
TaskProcessor.acton(TaskActon.RUN);
f (TaskProcessor.taskInstance().getState().typeIsFnshed()) {
f (TaskProcessor.taskInstance().getState() != task.getState()) {
task.setState(TaskProcessor.taskInstance().getState());
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | taskFnshed(task);
}
return true;
}
logger.error("state handler error: {}", stateEvent);
return true;
}
prvate vod taskFnshed(TaskInstance taskInstance) {
logger.nfo("work flow {} task d:{} code:{} state:{} ",
processInstance.getId(),
taskInstance.getId(),
taskInstance.getTaskCode(),
taskInstance.getState());
actveTaskProcessorMaps.remove(taskInstance.getTaskCode());
stateWheelExecuteThread.removeTask4TmeoutCheck(processInstance, taskInstance);
stateWheelExecuteThread.removeTask4RetryCheck(processInstance, taskInstance);
stateWheelExecuteThread.removeTask4StateCheck(processInstance, taskInstance);
f (taskInstance.getState().typeIsSuccess()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
processInstance.setVarPool(taskInstance.getVarPool());
processServce.saveProcessInstance(processInstance);
f (!processInstance.sBlocked()) {
submtPostNode(Long.toStrng(taskInstance.getTaskCode()));
}
} else f (taskInstance.taskCanRetry() && processInstance.getState() != ExecutonStatus.READY_STOP) {
retryTaskInstance(taskInstance);
} else f (taskInstance.getState().typeIsFalure()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (DagHelper.haveAllNodeAfterNode(Long.toStrng(taskInstance.getTaskCode()), dag)
&& processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) {
submtPostNode(Long.toStrng(taskInstance.getTaskCode()));
} else {
errorTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
kllAllTasks();
}
}
} else f (taskInstance.getState().typeIsFnshed()) {
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
}
ths.updateProcessInstanceState();
}
/**
* release task group
*
* @param taskInstance
*/
prvate vod releaseTaskGroup(TaskInstance taskInstance) {
f (taskInstance.getTaskGroupId() > 0) {
TaskInstance nextTaskInstance = ths.processServce.releaseTaskGroup(taskInstance);
f (nextTaskInstance != null) {
f (nextTaskInstance.getProcessInstanceId() == taskInstance.getProcessInstanceId()) {
StateEvent nextEvent = new StateEvent();
nextEvent.setProcessInstanceId(ths.processInstance.getId());
nextEvent.setTaskInstanceId(nextTaskInstance.getId());
nextEvent.setType(StateEventType.WAIT_TASK_GROUP);
ths.stateEvents.add(nextEvent);
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | ProcessInstance processInstance = ths.processServce.fndProcessInstanceById(nextTaskInstance.getProcessInstanceId());
ths.processServce.sendStartTask2Master(processInstance, nextTaskInstance.getId(),
org.apache.dolphnscheduler.remote.command.CommandType.TASK_WAKEUP_EVENT_REQUEST);
}
}
}
}
/**
* crate new task nstance to retry, dfferent objects from the orgnal
*
* @param taskInstance
*/
prvate vod retryTaskInstance(TaskInstance taskInstance) {
f (!taskInstance.taskCanRetry()) {
return;
}
TaskInstance newTaskInstance = cloneRetryTaskInstance(taskInstance);
f (newTaskInstance == null) {
logger.error("retry fal, new taskInstancce 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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, newTaskInstance);
stateWheelExecuteThread.addTask4RetryCheck(processInstance, newTaskInstance);
} else {
addTaskToStandByLst(newTaskInstance);
submtStandByTask();
watToRetryTaskInstanceMap.remove(newTaskInstance.getTaskCode());
}
}
/**
* handle task retry event
*
* @param stateEvent
* @return
*/
prvate boolean taskRetryEventHandler(StateEvent stateEvent) {
TaskInstance taskInstance = watToRetryTaskInstanceMap.get(stateEvent.getTaskCode());
addTaskToStandByLst(taskInstance);
submtStandByTask();
watToRetryTaskInstanceMap.remove(stateEvent.getTaskCode());
return true;
}
/**
* update process nstance
*/
publc vod refreshProcessInstance(nt processInstanceId) {
logger.nfo("process nstance update: {}", processInstanceId);
processInstance = processServce.fndProcessInstanceById(processInstanceId);
processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
processInstance.getProcessDefntonVerson());
processInstance.setProcessDefnton(processDefnton); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
/**
* update task nstance
*/
publc vod refreshTaskInstance(nt taskInstanceId) {
logger.nfo("task nstance update: {} ", taskInstanceId);
TaskInstance taskInstance = processServce.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()) {
valdTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId());
}
}
/**
* check process nstance by state event
*/
publc boolean checkProcessInstance(StateEvent stateEvent) {
f (ths.processInstance.getId() != stateEvent.getProcessInstanceId()) {
logger.error("msmatch process nstance d: {}, state event:{}",
ths.processInstance.getId(),
stateEvent);
return false;
}
return true;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | /**
* check f task nstance exst by state event
*/
publc boolean checkTaskInstanceByStateEvent(StateEvent stateEvent) {
f (stateEvent.getTaskInstanceId() == 0) {
logger.error("task nstance d null, state event:{}", stateEvent);
return false;
}
f (!taskInstanceMap.contansKey(stateEvent.getTaskInstanceId())) {
logger.error("msmatch task nstance d, event:{}", stateEvent);
return false;
}
return true;
}
/**
* check f task nstance exst by task code
*/
publc boolean checkTaskInstanceByCode(long taskCode) {
f (taskInstanceMap == null || taskInstanceMap.sze() == 0) {
return false;
}
for (TaskInstance taskInstance : taskInstanceMap.values()) {
f (taskInstance.getTaskCode() == taskCode) {
return true;
}
}
return false;
}
/**
* check f task nstance exst by d |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | */
publc boolean checkTaskInstanceById(nt taskInstanceId) {
f (taskInstanceMap == null || taskInstanceMap.sze() == 0) {
return false;
}
return taskInstanceMap.contansKey(taskInstanceId);
}
/**
* get task nstance from memory
*/
publc Optonal<TaskInstance> getTaskInstance(nt taskInstanceId) {
f (taskInstanceMap.contansKey(taskInstanceId)) {
return Optonal.ofNullable(taskInstanceMap.get(taskInstanceId));
}
return Optonal.empty();
}
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) {
f (actveTaskProcessorMaps.contansKey(taskCode)) {
return Optonal.ofNullable(actveTaskProcessorMaps.get(taskCode).taskInstance()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
return Optonal.empty();
}
publc Optonal<TaskInstance> getRetryTaskInstanceByTaskCode(long taskCode) {
f (watToRetryTaskInstanceMap.contansKey(taskCode)) {
return Optonal.ofNullable(watToRetryTaskInstanceMap.get(taskCode));
}
return Optonal.empty();
}
prvate boolean processStateChangeHandler(StateEvent stateEvent) {
try {
logger.nfo("process:{} state {} change to {}", processInstance.getId(), processInstance.getState(), stateEvent.getExecutonStatus());
f (stateEvent.getExecutonStatus() == ExecutonStatus.STOP) {
f (processDefnton.getExecutonType().typeIsSeralWat()){
endProcess();
return true;
}
ths.updateProcessInstanceState(stateEvent);
return true;
}
f (processComplementData()) {
return true;
}
f (stateEvent.getExecutonStatus().typeIsFnshed()) {
endProcess();
}
f (processInstance.getState() == ExecutonStatus.READY_STOP) {
kllAllTasks();
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | return true;
} catch (Excepton e) {
logger.error("process state change error:", e);
}
return true;
}
prvate boolean processBlockHandler(StateEvent stateEvent) {
try {
Optonal<TaskInstance> taskInstanceOptonal = getTaskInstance(stateEvent.getTaskInstanceId());
TaskInstance task = taskInstanceOptonal.orElseThrow(
() -> new RuntmeExcepton("Cannot fnd taskInstance by taskInstanceId:" + stateEvent.getTaskInstanceId()));
f (!checkTaskInstanceByStateEvent(stateEvent)) {
logger.error("task {} s not a blockng task", task.getTaskCode());
return false;
}
BlockngParameters parameters = JSONUtls.parseObject(task.getTaskParams(), BlockngParameters.class);
f (parameters.sAlertWhenBlockng()) {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendProcessBlockngAlert(processInstance, projectUser);
logger.nfo("processInstance {} block alert send successful!", processInstance.getId());
}
} catch (Excepton e) {
logger.error("sendng blockng message error:", e);
}
return true;
}
prvate boolean processComplementData() throws Excepton {
f (!needComplementProcess()) {
return false;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (processInstance.getState() == ExecutonStatus.READY_STOP) {
return false;
}
Date scheduleDate = processInstance.getScheduleTme();
f (scheduleDate == null) {
scheduleDate = complementLstDate.get(0);
} else f (processInstance.getState().typeIsFnshed()) {
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().typeIsSuccess()) {
logger.nfo("process complement end. process d:{}", processInstance.getId());
return true;
}
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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
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(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
}
cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtls.format(scheduleDate, "yyyy-MM-dd HH:mm:ss", null));
command.setCommandParam(JSONUtls.toJsonStrng(cmdParam));
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());
return processServce.createCommand(command);
}
prvate boolean needComplementProcess() {
f (processInstance.sComplementData()
&& Flag.NO == processInstance.getIsSubProcess()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | return true;
}
return false;
}
/**
* ProcessInstance start entrypont.
*/
@Overrde
publc vod run() {
f (ths.taskInstanceMap.sze() > 0 || sStart) {
logger.warn("The workflow has already been started");
return;
}
try {
buldFlowDag();
ntTaskQueue();
submtPostNode(null);
sStart = true;
} catch (Excepton e) {
logger.error("start process error, process nstance d:{}", processInstance.getId(), e);
}
}
/**
* process end handle
*/
publc vod endProcess() {
ths.stateEvents.clear();
f (processDefnton.getExecutonType().typeIsSeralWat()) {
checkSeralProcess(processDefnton);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (processInstance.getState().typeIsWatngThread()) {
processServce.createRecoveryWatngThreadCommand(null, processInstance);
}
f (processAlertManager.sNeedToSendWarnng(processInstance)) {
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendAlertProcessInstance(processInstance, getValdTaskLst(), projectUser);
}
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(), ExecutonStatus.SERIAL_WAIT.getCode(), processInstance.getId());
f (nextProcessInstance == null) {
return;
}
nextInstanceId = nextProcessInstance.getId();
}
ProcessInstance nextProcessInstance = ths.processServce.fndProcessInstanceById(nextInstanceId);
f (nextProcessInstance.getState().typeIsFnshed() || nextProcessInstance.getState().typeIsRunnng()) {
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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | command.setProcessDefntonCode(processDefnton.getCode());
command.setProcessDefntonVerson(processDefnton.getVerson());
command.setCommandParam(JSONUtls.toJsonStrng(cmdParam));
processServce.createCommand(command);
}
/**
* generate process dag
*
* @throws Excepton excepton
*/
prvate vod buldFlowDag() throws Excepton {
f (ths.dag != null) {
return;
}
processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
processInstance.getProcessDefntonVerson());
processInstance.setProcessDefnton(processDefnton);
Lst<TaskInstance> recoverNodeLst = getStartTaskInstanceLst(processInstance.getCommandParam());
Lst<ProcessTaskRelaton> processTaskRelatons = processServce.fndRelatonByCode(processDefnton.getCode(), processDefnton.getVerson());
Lst<TaskDefntonLog> taskDefntonLogs = processServce.getTaskDefneLogLstByRelaton(processTaskRelatons);
Lst<TaskNode> taskNodeLst = processServce.transformTask(processTaskRelatons, taskDefntonLogs);
forbddenTaskMap.clear();
taskNodeLst.forEach(taskNode -> {
f (taskNode.sForbdden()) {
forbddenTaskMap.put(taskNode.getCode(), taskNode);
}
});
Lst<Strng> recoveryNodeCodeLst = getRecoveryNodeCodeLst(recoverNodeLst);
Lst<Strng> startNodeNameLst = parseStartNodeName(processInstance.getCommandParam()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | ProcessDag processDag = generateFlowDag(taskNodeLst,
startNodeNameLst, recoveryNodeCodeLst, processInstance.getTaskDependType());
f (processDag == null) {
logger.error("processDag s null");
return;
}
dag = DagHelper.buldDagGraph(processDag);
}
/**
* nt task queue
*/
prvate vod ntTaskQueue() {
taskFaledSubmt = false;
actveTaskProcessorMaps.clear();
dependFaledTaskMap.clear();
completeTaskMap.clear();
errorTaskMap.clear();
f (!sNewProcessInstance()) {
Lst<TaskInstance> valdTaskInstanceLst = processServce.fndValdTaskLstByProcessId(processInstance.getId());
for (TaskInstance task : valdTaskInstanceLst) {
f (valdTaskMap.contansKey(task.getTaskCode())) {
nt oldTaskInstanceId = valdTaskMap.get(task.getTaskCode());
TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId);
f (!oldTaskInstance.getState().typeIsFnshed() && task.getState().typeIsFnshed()) {
task.setFlag(Flag.NO);
processServce.updateTaskInstance(task);
contnue;
}
logger.warn("have same taskCode taskInstance when nt task queue, taskCode:{}", task.getTaskCode()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
valdTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
f (task.sTaskComplete()) {
completeTaskMap.put(task.getTaskCode(), task.getId());
contnue;
}
f (task.sCondtonsTask() || DagHelper.haveCondtonsAfterNode(Long.toStrng(task.getTaskCode()), dag)) {
contnue;
}
f (task.taskCanRetry()) {
f (task.getState() == ExecutonStatus.NEED_FAULT_TOLERANCE) {
TaskInstance tolerantTaskInstance = cloneTolerantTaskInstance(task);
addTaskToStandByLst(tolerantTaskInstance);
} else {
retryTaskInstance(task);
}
contnue;
}
f (task.getState().typeIsFalure()) {
errorTaskMap.put(task.getTaskCode(), task.getId());
}
}
}
f (processInstance.sComplementData() && complementLstDate.sEmpty()) {
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
f (cmdParam != null && cmdParam.contansKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
setGlobalParamIfCommanded(processDefnton, cmdParam); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | Date start = DateUtls.strngToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtls.strngToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
Lst<Schedule> schedules = processServce.queryReleaseSchedulerLstByProcessDefntonCode(processInstance.getProcessDefntonCode());
f (complementLstDate.sEmpty() && needComplementProcess()) {
complementLstDate = CronUtls.getSelfFreDateLst(start, end, schedules);
logger.nfo(" process defnton code:{} complement data: {}",
processInstance.getProcessDefntonCode(), complementLstDate);
f (!complementLstDate.sEmpty() && Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTme(complementLstDate.get(0));
processInstance.setGlobalParams(ParameterUtls.curngGlobalParams(
processDefnton.getGlobalParamMap(),
processDefnton.getGlobalParamLst(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTme(), cmdParam.get(Constants.SCHEDULE_TIMEZONE)));
processServce.updateProcessInstance(processInstance);
}
}
}
}
}
/**
* submt task to execute
*
* @param taskInstance task nstance
* @return TaskInstance
*/
prvate TaskInstance submtTaskExec(TaskInstance taskInstance) {
try {
processServce.packageTaskInstance(taskInstance, processInstance);
ITaskProcessor taskProcessor = TaskProcessorFactory.getTaskProcessor(taskInstance.getTaskType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | taskProcessor.nt(taskInstance, processInstance);
f (taskInstance.getState() == ExecutonStatus.RUNNING_EXECUTION
&& taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) {
notfyProcessHostUpdate(taskInstance);
}
boolean submt = taskProcessor.acton(TaskActon.SUBMIT);
f (!submt) {
logger.error("process d:{} name:{} submt standby task d:{} name:{} faled!",
processInstance.getId(), processInstance.getName(),
taskInstance.getId(), taskInstance.getName());
return null;
}
f (valdTaskMap.contansKey(taskInstance.getTaskCode())) {
nt oldTaskInstanceId = valdTaskMap.get(taskInstance.getTaskCode());
f (taskInstance.getId() != oldTaskInstanceId) {
TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId);
oldTaskInstance.setFlag(Flag.NO);
processServce.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);
taskProcessor.acton(TaskActon.RUN);
stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, taskInstance);
stateWheelExecuteThread.addTask4StateCheck(processInstance, taskInstance);
f (taskProcessor.taskInstance().getState().typeIsFnshed()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (processInstance.sBlocked()) {
StateEvent processBlockEvent = new StateEvent();
processBlockEvent.setProcessInstanceId(ths.processInstance.getId());
processBlockEvent.setTaskInstanceId(taskInstance.getId());
processBlockEvent.setExecutonStatus(taskProcessor.taskInstance().getState());
processBlockEvent.setType(StateEventType.PROCESS_BLOCKED);
ths.stateEvents.add(processBlockEvent);
}
StateEvent taskStateChangeEvent = new StateEvent();
taskStateChangeEvent.setProcessInstanceId(ths.processInstance.getId());
taskStateChangeEvent.setTaskInstanceId(taskInstance.getId());
taskStateChangeEvent.setExecutonStatus(taskProcessor.taskInstance().getState());
taskStateChangeEvent.setType(StateEventType.TASK_STATE_CHANGE);
ths.stateEvents.add(taskStateChangeEvent);
}
return taskInstance;
} catch (Excepton e) {
logger.error("submt standby task error", e);
return null;
}
}
prvate vod notfyProcessHostUpdate(TaskInstance taskInstance) {
f (StrngUtls.sEmpty(taskInstance.getHost())) {
return;
}
try {
HostUpdateCommand hostUpdateCommand = new HostUpdateCommand();
hostUpdateCommand.setProcessHost(NetUtls.getAddr(masterConfg.getLstenPort()));
hostUpdateCommand.setTaskInstanceId(taskInstance.getId());
Host host = new Host(taskInstance.getHost()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | nettyExecutorManager.doExecute(host, hostUpdateCommand.convert2Command());
} catch (Excepton e) {
logger.error("notfy process host update", e);
}
}
/**
* fnd task nstance n db.
* 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
*
* @param processInstance process nstance
* @param taskNode taskNode
* @return TaskInstance
*/
prvate TaskInstance createTaskInstance(ProcessInstance processInstance, TaskNode taskNode) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | TaskInstance taskInstance = fndTaskIfExsts(taskNode.getCode(), taskNode.getVerson());
f (taskInstance != null) {
return taskInstance;
}
return newTaskInstance(processInstance, taskNode);
}
/**
* clone a new taskInstance for retry and reset some logc felds
*
* @return
*/
publc TaskInstance cloneRetryTaskInstance(TaskInstance taskInstance) {
TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode()));
f (taskNode == null) {
logger.error("taskNode s null, code:{}", 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());
return newTaskInstance;
}
/**
* clone a new taskInstance for tolerant and reset some logc felds
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * @return
*/
publc TaskInstance cloneTolerantTaskInstance(TaskInstance taskInstance) {
TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode()));
f (taskNode == null) {
logger.error("taskNode s null, code:{}", 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());
return newTaskInstance;
}
/**
* new a taskInstance
*
* @param processInstance
* @param taskNode
* @return
*/
publc TaskInstance newTaskInstance(ProcessInstance processInstance, TaskNode taskNode) {
TaskInstance taskInstance = new TaskInstance();
taskInstance.setTaskCode(taskNode.getCode());
taskInstance.setTaskDefntonVerson(taskNode.getVerson());
taskInstance.setName(taskNode.getName()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | taskInstance.setState(ExecutonStatus.SUBMITTED_SUCCESS);
taskInstance.setProcessInstanceId(processInstance.getId());
taskInstance.setTaskType(taskNode.getType().toUpperCase());
taskInstance.setAlertFlag(Flag.NO);
taskInstance.setStartTme(null);
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());
f (taskNode.getTaskInstanceProrty() == null) {
taskInstance.setTaskInstanceProrty(Prorty.MEDIUM); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | } 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());
return taskInstance;
}
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) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | 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());
}
}
}
prvate vod setVarPoolValue(Map<Strng, Property> allProperty, Map<Strng, TaskInstance> allTaskInstance, TaskInstance preTaskInstance, Property thsProperty) {
thsProperty.setDrect(Drect.IN);
Strng proName = thsProperty.getProp(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | 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);
}
} 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<>(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | for (Integer taskInstanceId : completeTaskMap.values()) {
TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId);
completeTaskInstanceMap.put(Long.toStrng(taskInstance.getTaskCode()), taskInstance);
}
return completeTaskInstanceMap;
}
/**
* get vald task lst
*/
prvate Lst<TaskInstance> getValdTaskLst() {
Lst<TaskInstance> valdTaskInstanceLst = new ArrayLst<>();
for (Integer taskInstanceId : valdTaskMap.values()) {
valdTaskInstanceLst.add(taskInstanceMap.get(taskInstanceId));
}
return valdTaskInstanceLst;
}
prvate vod submtPostNode(Strng parentNodeCode) {
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);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | 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));
} else {
processInstance.setVarPool(JSONUtls.toJsonStrng(taskPropertes));
}
}
}
for (TaskInstance task : taskInstances) {
f (readyToSubmtTaskQueue.contans(task)) {
contnue;
}
f (task.getId() > 0 && completeTaskMap.contansKey(task.getTaskCode())) {
logger.nfo("task {} has already run success", task.getName());
contnue;
}
f (task.getState().typeIsPause() || task.getState().typeIsCancel()) {
logger.nfo("task {} stopped, the state s {}", task.getName(), task.getState());
contnue;
}
addTaskToStandByLst(task);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | submtStandByTask();
updateProcessInstanceState();
}
/**
* determne whether the dependences of the task node are complete
*
* @return DependResult
*/
prvate DependResult sTaskDepsComplete(Strng taskCode) {
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);
ExecutonStatus depTaskState = taskInstanceMap.get(depsTaskId).getState();
f (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) {
return DependResult.NON_EXEC;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (taskNode.sBlockngTask()) {
contnue;
}
f (taskNode.sCondtonsTask()) {
contnue;
}
f (!dependTaskSuccess(depsNode, taskCode)) {
return DependResult.FAILED;
}
}
}
logger.nfo("taskCode: {} completeDependTaskLst: {}", 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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
}
}
/**
* 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()) {
Lst<Strng> nextTaskLst = DagHelper.parseCondtonTask(dependNodeName, skpTaskNodeMap, dag, getCompleteTaskInstanceMap());
f (!nextTaskLst.contans(nextNodeName)) {
return false;
}
} else {
long taskCode = Long.parseLong(dependNodeName);
Integer taskInstanceId = completeTaskMap.get(taskCode);
ExecutonStatus depTaskState = taskInstanceMap.get(taskInstanceId).getState();
f (depTaskState.typeIsFalure()) {
return false;
}
}
return true;
}
/**
* query task nstance by complete state
*
* @param state state
* @return task nstance lst
*/
prvate Lst<TaskInstance> getCompleteTaskByState(ExecutonStatus state) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | Lst<TaskInstance> resultLst = new ArrayLst<>();
for (Integer taskInstanceId : completeTaskMap.values()) {
TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId);
f (taskInstance != null && taskInstance.getState() == state) {
resultLst.add(taskInstance);
}
}
return resultLst;
}
/**
* where there are ongong tasks
*
* @param state state
* @return ExecutonStatus
*/
prvate ExecutonStatus runnngState(ExecutonStatus state) {
f (state == ExecutonStatus.READY_STOP
|| state == ExecutonStatus.READY_PAUSE
|| state == ExecutonStatus.WAITING_THREAD
|| state == ExecutonStatus.READY_BLOCK
|| state == ExecutonStatus.DELAY_EXECUTION) {
return state;
} else {
return ExecutonStatus.RUNNING_EXECUTION;
}
}
/**
* exsts falure task,contans submt falure、dependency falure,execute falure(retry after)
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * @return Boolean whether has faled task
*/
prvate boolean hasFaledTask() {
f (ths.taskFaledSubmt) {
return true;
}
f (ths.errorTaskMap.sze() > 0) {
return true;
}
return ths.dependFaledTaskMap.sze() > 0;
}
/**
* process nstance falure
*
* @return Boolean whether process nstance faled
*/
prvate boolean processFaled() {
f (hasFaledTask()) {
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
return true;
}
f (processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) {
return readyToSubmtTaskQueue.sze() == 0
&& actveTaskProcessorMaps.sze() == 0
&& watToRetryTaskInstanceMap.sze() == 0;
}
}
return false;
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * whether task for watng thread
*
* @return Boolean whether has watng thread task
*/
prvate boolean hasWatngThreadTask() {
Lst<TaskInstance> watngLst = getCompleteTaskByState(ExecutonStatus.WAITING_THREAD);
return CollectonUtls.sNotEmpty(watngLst);
}
/**
* 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
*/
prvate ExecutonStatus processReadyPause() {
f (hasRetryTaskInStandBy()) {
return ExecutonStatus.FAILURE;
}
Lst<TaskInstance> pauseLst = getCompleteTaskByState(ExecutonStatus.PAUSE);
f (CollectonUtls.sNotEmpty(pauseLst)
|| processInstance.sBlocked()
|| !sComplementEnd()
|| readyToSubmtTaskQueue.sze() > 0) {
return ExecutonStatus.PAUSE;
} else {
return ExecutonStatus.SUCCESS;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | /**
* 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 ExecutonStatus 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(); ) {
ter.next().setState(ExecutonStatus.KILL);
}
}
return ExecutonStatus.BLOCK;
}
/**
* generate the latest process nstance status by the tasks state
*
* @return process nstance executon status
*/
prvate ExecutonStatus getProcessInstanceState(ProcessInstance nstance) {
ExecutonStatus state = nstance.getState(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) {
// actve
return runnngState(state);
}
// block
f (state == ExecutonStatus.READY_BLOCK) {
return processReadyBlock();
}
// watng thread
f (hasWatngThreadTask()) {
return ExecutonStatus.WAITING_THREAD;
}
// pause
f (state == ExecutonStatus.READY_PAUSE) {
return processReadyPause();
}
// stop
f (state == ExecutonStatus.READY_STOP) {
Lst<TaskInstance> stopLst = getCompleteTaskByState(ExecutonStatus.STOP);
Lst<TaskInstance> kllLst = getCompleteTaskByState(ExecutonStatus.KILL);
Lst<TaskInstance> falLst = getCompleteTaskByState(ExecutonStatus.FAILURE);
f (CollectonUtls.sNotEmpty(stopLst)
|| CollectonUtls.sNotEmpty(kllLst)
|| CollectonUtls.sNotEmpty(falLst)
|| !sComplementEnd()) {
return ExecutonStatus.STOP;
} else {
return ExecutonStatus.SUCCESS;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | // process falure
f (processFaled()) {
return ExecutonStatus.FAILURE;
}
// success
f (state == ExecutonStatus.RUNNING_EXECUTION) {
Lst<TaskInstance> kllTasks = getCompleteTaskByState(ExecutonStatus.KILL);
f (readyToSubmtTaskQueue.sze() > 0 || watToRetryTaskInstanceMap.sze() > 0) {
//tasks cu
return ExecutonStatus.RUNNING_EXECUTION;
} else f (CollectonUtls.sNotEmpty(kllTasks)) {
// tasks m
return ExecutonStatus.FAILURE;
} else {
// f the
return ExecutonStatus.SUCCESS;
}
}
return state;
}
/**
* whether complement end
*
* @return Boolean whether s complement end
*/
prvate boolean sComplementEnd() {
f (!processInstance.sComplementData()) {
return true;
}
try { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
Date endTme = DateUtls.getScheduleDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
return processInstance.getScheduleTme().equals(endTme);
} catch (Excepton e) {
logger.error("complement end faled ", e);
return false;
}
}
/**
* updateProcessInstance process nstance state
* after each batch of tasks s executed, the status of the process nstance s updated
*/
prvate vod updateProcessInstanceState() {
ExecutonStatus state = getProcessInstanceState(processInstance);
f (processInstance.getState() != state) {
logger.nfo(
"work flow process nstance [d: {}, name:{}], state change from {} to {}, cmd type: {}",
processInstance.getId(), processInstance.getName(),
processInstance.getState(), state,
processInstance.getCommandType());
processInstance.setState(state);
f (state.typeIsFnshed()) {
processInstance.setEndTme(new Date());
}
processServce.updateProcessInstance(processInstance);
StateEvent stateEvent = new StateEvent();
stateEvent.setExecutonStatus(processInstance.getState());
stateEvent.setProcessInstanceId(ths.processInstance.getId());
stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE);
// ths.pr |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | // replace
ths.stateEvents.add(stateEvent);
}
}
/**
* stateEvent's executon status as process nstance state
*/
prvate vod updateProcessInstanceState(StateEvent stateEvent) {
ExecutonStatus state = stateEvent.getExecutonStatus();
f (processInstance.getState() != state) {
logger.nfo(
"work flow process nstance [d: {}, name:{}], state change from {} to {}, cmd type: {}",
processInstance.getId(), processInstance.getName(),
processInstance.getState(), state,
processInstance.getCommandType());
processInstance.setState(state);
f (state.typeIsFnshed()) {
processInstance.setEndTme(new Date());
}
processServce.updateProcessInstance(processInstance);
}
}
/**
* get task dependency result
*
* @param taskInstance task nstance
* @return DependResult
*/
prvate DependResult getDependResultForTask(TaskInstance taskInstance) {
return sTaskDepsComplete(Long.toStrng(taskInstance.getTaskCode())); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
/**
* add task to standby lst
*
* @param taskInstance task nstance
*/
prvate vod addTaskToStandByLst(TaskInstance taskInstance) {
try {
f (readyToSubmtTaskQueue.contans(taskInstance)) {
logger.warn("task was found n ready submt queue, task code:{}", taskInstance.getTaskCode());
return;
}
logger.nfo("add task to stand by lst, task name:{}, task d:{}, task code:{}",
taskInstance.getName(), taskInstance.getId(), taskInstance.getTaskCode());
TaskMetrcs.ncTaskSubmt();
readyToSubmtTaskQueue.put(taskInstance);
} catch (Excepton e) {
logger.error("add task nstance to readyToSubmtTaskQueue, taskName:{}, task d:{}", taskInstance.getName(), taskInstance.getId(), e);
}
}
/**
* remove task from stand by lst
*
* @param taskInstance task nstance
*/
prvate vod removeTaskFromStandbyLst(TaskInstance taskInstance) {
logger.nfo("remove task from stand by lst, d: {} name:{}",
taskInstance.getId(),
taskInstance.getName());
try { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | readyToSubmtTaskQueue.remove(taskInstance);
} catch (Excepton e) {
logger.error("remove task nstance from readyToSubmtTaskQueue error, task d:{}, Name: {}",
taskInstance.getId(),
taskInstance.getName(), e);
}
}
/**
* 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().typeIsFalure()) {
return true;
}
}
return false;
}
/**
* close the on gong tasks
*/
prvate vod kllAllTasks() {
logger.nfo("kll called on process nstance d: {}, num: {}", processInstance.getId(),
actveTaskProcessorMaps.sze());
f (readyToSubmtTaskQueue.sze() > 0) {
readyToSubmtTaskQueue.clear();
}
for (long taskCode : actveTaskProcessorMaps.keySet()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode);
Integer taskInstanceId = valdTaskMap.get(taskCode);
f (taskInstanceId == null || taskInstanceId.equals(0)) {
contnue;
}
TaskInstance taskInstance = processServce.fndTaskInstanceById(taskInstanceId);
f (taskInstance == null || taskInstance.getState().typeIsFnshed()) {
contnue;
}
taskProcessor.acton(TaskActon.STOP);
f (taskProcessor.taskInstance().getState().typeIsFnshed()) {
StateEvent stateEvent = new StateEvent();
stateEvent.setType(StateEventType.TASK_STATE_CHANGE);
stateEvent.setProcessInstanceId(ths.processInstance.getId());
stateEvent.setTaskInstanceId(taskInstance.getId());
stateEvent.setExecutonStatus(taskProcessor.taskInstance().getState());
ths.addStateEvent(stateEvent);
}
}
}
publc boolean workFlowFnsh() {
return ths.processInstance.getState().typeIsFnshed();
}
/**
* handlng the lst of tasks to be submtted
*/
prvate vod submtStandByTask() {
try {
nt length = readyToSubmtTaskQueue.sze();
for (nt = 0; < length; ++) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | TaskInstance task = readyToSubmtTaskQueue.peek();
f (task == null) {
contnue;
}
// stop ta
f (task.taskCanRetry()) {
TaskInstance retryTask = processServce.fndTaskInstanceById(task.getId());
f (retryTask != null && retryTask.getState().equals(ExecutonStatus.FORCED_SUCCESS)) {
task.setState(retryTask.getState());
logger.nfo("task: {} has been forced success, put t nto complete task lst and stop retryng", task.getName());
removeTaskFromStandbyLst(task);
completeTaskMap.put(task.getTaskCode(), task.getId());
taskInstanceMap.put(task.getId(), task);
submtPostNode(Long.toStrng(task.getTaskCode()));
contnue;
}
}
//nt var
f (task.sFrstRun()) {
//get pre
Set<Strng> preTask = dag.getPrevousNodes(Long.toStrng(task.getTaskCode()));
getPreVarPool(task, preTask);
}
DependResult dependResult = getDependResultForTask(task);
f (DependResult.SUCCESS == dependResult) {
TaskInstance taskInstance = submtTaskExec(task);
f (taskInstance == null) {
ths.taskFaledSubmt = true;
// Remove
removeTaskFromStandbyLst(task); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | completeTaskMap.put(task.getTaskCode(), task.getId());
errorTaskMap.put(task.getTaskCode(), task.getId());
logger.error("process {}, task {}, code:{} submt task faled.", task.getProcessInstanceId(), task.getName(), task.getTaskCode());
} else {
removeTaskFromStandbyLst(task);
}
} else f (DependResult.FAILED == dependResult) {
// f the
dependFaledTaskMap.put(task.getTaskCode(), task.getId());
removeTaskFromStandbyLst(task);
logger.nfo("task {},d:{} depend result : {}", task.getName(), task.getId(), dependResult);
} else f (DependResult.NON_EXEC == dependResult) {
// for som
removeTaskFromStandbyLst(task);
logger.nfo("remove task {},d:{} , because depend result : {}", task.getName(), task.getId(), dependResult);
}
}
} catch (Excepton e) {
logger.error("submt standby task error", e);
}
}
/**
* get recovery task nstance lst
*
* @param taskIdArray task d array
* @return recovery task nstance lst
*/
prvate Lst<TaskInstance> getRecoverTaskInstanceLst(Strng[] taskIdArray) {
f (taskIdArray == null || taskIdArray.length == 0) {
return new ArrayLst<>(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
Lst<Integer> taskIdLst = new ArrayLst<>(taskIdArray.length);
for (Strng taskId : taskIdArray) {
try {
Integer d = Integer.valueOf(taskId);
taskIdLst.add(d);
} catch (Excepton e) {
logger.error("get recovery task nstance faled ", e);
}
}
return processServce.fndTaskInstanceByIdLst(taskIdLst);
}
/**
* get start task nstance lst
*
* @param cmdParam command param
* @return task nstance lst
*/
prvate Lst<TaskInstance> getStartTaskInstanceLst(Strng cmdParam) {
Lst<TaskInstance> nstanceLst = new ArrayLst<>();
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
f (paramMap != null && paramMap.contansKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) {
Strng[] dLst = paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING).splt(Constants.COMMA);
nstanceLst = getRecoverTaskInstanceLst(dLst);
}
return nstanceLst;
}
/**
* parse "StartNodeNameLst" from cmd param
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * @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()));
}
}
return recoveryNodeCodeLst;
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | * 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();
}
/**
* s new process nstance
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | prvate boolean sNewProcessInstance() {
f (ExecutonStatus.RUNNING_EXECUTION == processInstance.getState() && processInstance.getRunTmes() == 1) {
return true;
} else f (processInstance.getRecovery().equals(Flag.YES)) {
// host s
return false;
} else {
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);
}
}
prvate vod setGlobalParamIfCommanded(ProcessDefnton processDefnton, Map<Strng, Strng> cmdParam) {
// get start params from command param
Map<Strng, Strng> startParamMap = new HashMap<>();
f (cmdParam.contansKey(Constants.CMD_PARAM_START_PARAMS)) {
Strng startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtls.toMap(startParamJson);
}
Map<Strng, Strng> fatherParamMap = new HashMap<>();
f (cmdParam.contansKey(Constants.CMD_PARAM_FATHER_PARAMS)) {
Strng fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtls.toMap(fatherParamJson); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | }
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 pa
for (Map.Entry<Strng, Strng> param : globalMap.entrySet()) {
Strng val = startParamMap.get(param.getKey());
f (val != null) {
param.setValue(val);
}
}
//start pa
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()));
}
}
}
}
prvate vod measureProcessState(StateEvent processStateEvent) {
f (processStateEvent.getExecutonStatus().typeIsFnshed()) {
ProcessInstanceMetrcs.ncProcessInstanceFnsh();
}
swtch (processStateEvent.getExecutonStatus()) {
case STOP:
ProcessInstanceMetrcs.ncProcessInstanceStop();
break; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java | case SUCCESS:
ProcessInstanceMetrcs.ncProcessInstanceSuccess();
break;
case FAILURE:
ProcessInstanceMetrcs.ncProcessInstanceFalure();
break;
default:
break;
}
}
prvate vod measureTaskState(StateEvent taskStateEvent) {
f (taskStateEvent.getExecutonStatus().typeIsFnshed()) {
TaskMetrcs.ncTaskFnsh();
}
swtch (taskStateEvent.getExecutonStatus()) {
case STOP:
TaskMetrcs.ncTaskStop();
break;
case SUCCESS:
TaskMetrcs.ncTaskSuccess();
break;
case FAILURE:
TaskMetrcs.ncTaskFalure();
break;
default:
break;
}
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.service.corn;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.day; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | import static org.apache.dolphinscheduler.service.corn.CycleFactory.hour;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.min;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.month;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.week;
import static org.apache.dolphinscheduler.service.corn.CycleFactory.year;
import static com.cronutils.model.CronType.QUARTZ;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CycleEnum;
import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.commons.collections.CollectionUtils;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import org.quartz.CronExpression;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.cronutils.model.Cron;
import com.cronutils.model.definition.CronDefinitionBuilder;
import com.cronutils.parser.CronParser;
/**
* // todo: this utils is heavy, it rely on quartz and corn-utils.
* cron utils
*/
public class CronUtils { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | private CronUtils() {
throw new IllegalStateException("CronUtils class");
}
private static final Logger logger = LoggerFactory.getLogger(CronUtils.class);
private static final CronParser QUARTZ_CRON_PARSER = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(QUARTZ));
/**
* parse to cron
*
* @param cronExpression cron expression, never null
* @return Cron instance, corresponding to cron expression received
*/
public static Cron parse2Cron(String cronExpression) {
return QUARTZ_CRON_PARSER.parse(cronExpression);
}
/**
* build a new CronExpression based on the string cronExpression
*
* @param cronExpression String representation of the cron expression the new object should represent
* @return CronExpression
* @throws ParseException if the string expression cannot be parsed into a valid
*/
public static CronExpression parse2CronExpression(String cronExpression) throws ParseException {
return new CronExpression(cronExpression);
}
/**
* get max cycle |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | *
* @param cron cron
* @return CycleEnum
*/
public static CycleEnum getMaxCycle(Cron cron) {
return min(cron).addCycle(hour(cron)).addCycle(day(cron)).addCycle(week(cron)).addCycle(month(cron)).addCycle(year(cron)).getCycle();
}
/**
* get min cycle
*
* @param cron cron
* @return CycleEnum
*/
public static CycleEnum getMiniCycle(Cron cron) {
return min(cron).addCycle(hour(cron)).addCycle(day(cron)).addCycle(week(cron)).addCycle(month(cron)).addCycle(year(cron)).getMiniCycle();
}
/**
* get max cycle
*
* @param crontab crontab
* @return CycleEnum
*/
public static CycleEnum getMaxCycle(String crontab) {
return getMaxCycle(parse2Cron(crontab));
}
/**
* gets all scheduled times for a period of time based on not self dependency
*
* @param startTime startTime
* @param endTime endTime |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | * @param cronExpression cronExpression
* @return date list
*/
public static List<Date> getFireDateList(Date startTime, Date endTime, CronExpression cronExpression) {
List<Date> dateList = new ArrayList<>();
while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime)) {
break;
}
dateList.add(startTime);
}
return dateList;
}
/**
* gets expect scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cronExpression cronExpression
* @param fireTimes fireTimes
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, CronExpression cronExpression, int fireTimes) {
List<Date> dateList = new ArrayList<>();
while (fireTimes > 0) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) {
break;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | dateList.add(startTime);
fireTimes--;
}
return dateList;
}
/**
* gets all scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cronExpression cronExpression
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, CronExpression cronExpression) {
List<Date> dateList = new ArrayList<>();
while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) {
break;
}
dateList.add(startTime);
}
return dateList;
}
/**
* gets all scheduled times for a period of time based on self dependency
* if schedulers is empty then default scheduler = 1 day
*/
public static List<Date> getSelfFireDateList(final Date startTime, final Date endTime, final List<Schedule> schedules) {
List<Date> result = new ArrayList<>(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | if (startTime.equals(endTime)) {
result.add(startTime);
return result;
}
Date from = new Date(startTime.getTime() - Constants.SECOND_TIME_MILLIS);
Date to = new Date(endTime.getTime() + Constants.SECOND_TIME_MILLIS);
List<Schedule> listSchedule = new ArrayList<>();
listSchedule.addAll(schedules);
if (CollectionUtils.isEmpty(listSchedule)) {
Schedule schedule = new Schedule();
schedule.setCrontab(Constants.DEFAULT_CRON_STRING);
listSchedule.add(schedule);
}
for (Schedule schedule : listSchedule) {
result.addAll(CronUtils.getSelfFireDateList(from, to, schedule.getCrontab()));
}
return result;
}
/**
* gets all scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cron cron
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, String cron) {
CronExpression cronExpression = null;
try { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | cronExpression = parse2CronExpression(cron);
} catch (ParseException e) {
logger.error(e.getMessage(), e);
return Collections.emptyList();
}
return getSelfFireDateList(startTime, endTime, cronExpression);
}
/**
* get expiration time
*
* @param startTime startTime
* @param cycleEnum cycleEnum
* @return date
*/
public static Date getExpirationTime(Date startTime, CycleEnum cycleEnum) {
Date maxExpirationTime = null;
Date startTimeMax = null;
try {
startTimeMax = getEndTime(startTime);
Calendar calendar = Calendar.getInstance();
calendar.setTime(startTime);
switch (cycleEnum) {
case HOUR:
calendar.add(Calendar.HOUR, 1);
break;
case DAY:
calendar.add(Calendar.DATE, 1);
break;
case WEEK:
calendar.add(Calendar.DATE, 1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,370 | [Improvement] [Api & Master] Complement function transformation | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
The function of replenishment is changed to that the user enters the data date of the amount to be replenished. The system generates a batch of task instances in batch based on the date entered by the user
### What you expected to happen
Remove the dependency on scheduled tasks
### How to reproduce
1.The replenishment function is changed to enter the data date of the amount to be replenished by the user. The system generates a batch of task instances in batch based on the date entered by the user.
2.Remove the dependency on scheduled tasks
3.Change the filling method of data date to manual input of text box
### 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/10370 | https://github.com/apache/dolphinscheduler/pull/10376 | 088c5e8ae2b86d70870db3c594378192657a0d41 | f6fea06f1051f5962106e6299eea9696bddf12d4 | 2022-06-07T02:44:52Z | java | 2022-06-12T04:35:08Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/corn/CronUtils.java | break;
case MONTH:
calendar.add(Calendar.DATE, 1);
break;
default:
logger.error("Dependent process definition's cycleEnum is {},not support!!", cycleEnum);
break;
}
maxExpirationTime = calendar.getTime();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return DateUtils.compare(startTimeMax, maxExpirationTime) ? maxExpirationTime : startTimeMax;
}
/**
* get the end time of the day by value of date
*
* @return date
*/
private static Date getEndTime(Date date) {
Calendar end = new GregorianCalendar();
end.setTime(date);
end.set(Calendar.HOUR_OF_DAY, 23);
end.set(Calendar.MINUTE, 59);
end.set(Calendar.SECOND, 59);
end.set(Calendar.MILLISECOND, 999);
return end.getTime();
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.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.permission;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.slf4j.Logger;
import java.util.List;
import java.util.Set;
public interface ResourcePermissionCheckService<T>{ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java | /**
* resourcePermissionCheck
* @param authorizationType
* @param needChecks
* @param userId
* @param logger
* @return
*/
boolean resourcePermissionCheck(AuthorizationType authorizationType, Object[] needChecks, Integer userId, Logger logger);
/**
* userOwnedResourceIdsAcquisition |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java | * @param authorizationType
* @param userId
* @param logger
* @param <T>
* @return
*/
Set<T> userOwnedResourceIdsAcquisition(AuthorizationType authorizationType, Integer userId, Logger logger);
/**
* operationpermissionCheck
* @param authorizationType
* @param userId
* @param permissionKey
* @param logger
* @return
*/
boolean operationPermissionCheck(AuthorizationType authorizationType, Integer userId, String permissionKey, Logger logger);
/**
* functionDisabled
* @return
*/
boolean functionDisabled();
/**
* associated with the current user after the resource is created
* @param authorizationType
* @param ids
* @param logger
*/
void postHandle(AuthorizationType authorizationType, Integer userId, List<Integer> ids, Logger logger);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.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.
*/
/*
* 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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | * 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.permission;
import static java.util.stream.Collectors.toSet;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.AccessToken;
import org.apache.dolphinscheduler.dao.entity.AlertGroup;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | import org.apache.dolphinscheduler.service.process.ProcessService;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@Component
public class ResourcePermissionCheckServiceImpl implements ResourcePermissionCheckService<Object>, ApplicationContextAware {
@Autowired
private ProcessService processService;
public static final Map<AuthorizationType, ResourceAcquisitionAndPermissionCheck<?>> RESOURCE_LIST_MAP = new ConcurrentHashMap<>();
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
for (ResourceAcquisitionAndPermissionCheck<?> authorizedResourceList : applicationContext.getBeansOfType(ResourceAcquisitionAndPermissionCheck.class).values()) {
List<AuthorizationType> authorizationTypes = authorizedResourceList.authorizationTypes();
authorizationTypes.forEach(auth -> RESOURCE_LIST_MAP.put(auth, authorizedResourceList));
}
}
@Override
public boolean resourcePermissionCheck(AuthorizationType authorizationType, Object[] needChecks, Integer userId, Logger logger) {
if (Objects.nonNull(needChecks) && needChecks.length > 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | Set<?> originResSet = new HashSet<>(Arrays.asList(needChecks));
Set<?> ownResSets = RESOURCE_LIST_MAP.get(authorizationType).listAuthorizedResource(userId, logger);
originResSet.removeAll(ownResSets);
return originResSet.isEmpty();
}
return true;
}
@Override
public boolean operationPermissionCheck(AuthorizationType authorizationType, Integer userId, String permissionKey, Logger logger) {
return RESOURCE_LIST_MAP.get(authorizationType).permissionCheck(userId, permissionKey, logger);
}
@Override
public boolean functionDisabled() {
return false;
}
@Override
public void postHandle(AuthorizationType authorizationType, Integer userId, List<Integer> ids, Logger logger) {
logger.debug("no post handle");
}
@Override
public Set<Object> userOwnedResourceIdsAcquisition(AuthorizationType authorizationType, Integer userId, Logger logger) {
User user = processService.getUserById(userId);
if (user == null) {
logger.error("user id {} doesn't exist", userId);
return Collections.emptySet();
}
return (Set<Object>) RESOURCE_LIST_MAP.get(authorizationType).listAuthorizedResource(
user.getUserType().equals(UserType.ADMIN_USER) ? 0 : userId, logger);
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class ProjectsResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final ProjectMapper projectMapper;
public ProjectsResourcePermissionCheck(ProjectMapper projectMapper) {
this.projectMapper = projectMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.PROJECTS);
}
@Override
public boolean permissionCheck(int userId, String permissionKey, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return projectMapper.listAuthorizedProjects(userId, null).stream().map(Project::getId).collect(toSet());
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class MonitorResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.MONITOR);
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return null;
}
@Override
public boolean permissionCheck(int userId, String permissionKey, Logger logger) {
return true;
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class FilePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final ResourceMapper resourceMapper;
public FilePermissionCheck(ResourceMapper resourceMapper) {
this.resourceMapper = resourceMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Arrays.asList(AuthorizationType.RESOURCE_FILE_ID, AuthorizationType.UDF_FILE);
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
List<Resource> resources = resourceMapper.queryResourceList(null, userId, -1);
if (resources.isEmpty()){
return Collections.emptySet();
}
return resources.stream().map(Resource::getId).collect(toSet());
}
@Override
public boolean permissionCheck(int userId, String permissionKey, Logger logger) {
return true;
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class UdfFuncPermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final UdfFuncMapper udfFuncMapper;
public UdfFuncPermissionCheck(UdfFuncMapper udfFuncMapper) {
this.udfFuncMapper = udfFuncMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.UDF);
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
List<UdfFunc> udfFuncList = udfFuncMapper.listAuthorizedUdfByUserId(userId);
if (udfFuncList.isEmpty()){
return Collections.emptySet();
}
return udfFuncList.stream().map(UdfFunc::getId).collect(toSet());
}
@Override
public boolean permissionCheck(int userId, String permissionKey, Logger logger) {
return true;
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class TaskGroupPermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.TASK_GROUP);
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return null;
}
@Override
public boolean permissionCheck(int userId, String permissionKey, Logger logger) {
return true;
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class K8sNamespaceResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final K8sNamespaceMapper k8sNamespaceMapper;
public K8sNamespaceResourceList(K8sNamespaceMapper k8sNamespaceMapper) {
this.k8sNamespaceMapper = k8sNamespaceMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.K8S_NAMESPACE);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class EnvironmentResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final EnvironmentMapper environmentMapper;
public EnvironmentResourceList(EnvironmentMapper environmentMapper) {
this.environmentMapper = environmentMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.ENVIRONMENT);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class QueueResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final QueueMapper queueMapper;
public QueueResourceList(QueueMapper queueMapper) {
this.queueMapper = queueMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.QUEUE);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
}
}
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class WorkerGroupResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final WorkerGroupMapper workerGroupMapper;
public WorkerGroupResourceList(WorkerGroupMapper workerGroupMapper) {
this.workerGroupMapper = workerGroupMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.WORKER_GROUP);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
}
}
/**
* AlertPluginInstance Resource
*/
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class AlertPluginInstanceResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final AlertPluginInstanceMapper alertPluginInstanceMapper;
public AlertPluginInstanceResourceList(AlertPluginInstanceMapper alertPluginInstanceMapper) {
this.alertPluginInstanceMapper = alertPluginInstanceMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.ALERT_PLUGIN_INSTANCE);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
}
}
/**
* AlertPluginInstance Resource
*/
@Component |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 10,409 | [Bug] [Permission] No permission to modify the allocated resource data. | ### 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
No permission to modify the allocated resource data.
### What you expected to happen
Update success.
### How to reproduce
Allocate resource data and then modify it.
### Anything else
No Response.
### Version
dev
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/10409 | https://github.com/apache/dolphinscheduler/pull/10410 | f4dad689d493dcd0d64026c6df3350ca0f9ba805 | c843e3a31550c5a23c7e68624dfaa59bdd7957f8 | 2022-06-11T08:30:01Z | java | 2022-06-12T10:27:49Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java | public static class AlertGroupResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
private final AlertGroupMapper alertGroupMapper;
public AlertGroupResourceList(AlertGroupMapper alertGroupMapper) {
this.alertGroupMapper = alertGroupMapper;
}
@Override
public List<AuthorizationType> authorizationTypes() {
return Collections.singletonList(AuthorizationType.ALERT_GROUP);
}
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
return true;
}
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return alertGroupMapper.listAuthorizedAlertGroupList(userId, null).stream().map(AlertGroup::getId).collect(toSet());
}
}
/**
* Tenant Resource
*/
@Component |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.