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
unknown | language
stringclasses 5
values | commit_datetime
unknown | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | if (resultSet != null) {
try {
resultSet.close();
} catch (SQLException e) {
logger.error("close result set error : {}", e.getMessage(), e);
}
}
if (pstmt != null) {
try {
pstmt.close();
} catch (SQLException e) {
logger.error("close prepared statement error : {}", e.getMessage(), e);
}
}
if (connection != null) {
try {
connection.close();
} catch (SQLException e) {
logger.error("close connection error : {}", e.getMessage(), e);
}
}
}
/**
* preparedStatement bind
*
* @param connection connection
* @param sqlBinds sqlBinds
* @return PreparedStatement
* @throws Exception Exception
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) {
boolean timeoutFlag = taskExecutionContext.getTaskTimeoutStrategy() == TaskTimeoutStrategy.FAILED
|| taskExecutionContext.getTaskTimeoutStrategy() == TaskTimeoutStrategy.WARNFAILED;
try (PreparedStatement stmt = connection.prepareStatement(sqlBinds.getSql())) {
if (timeoutFlag) {
stmt.setQueryTimeout(taskExecutionContext.getTaskTimeout());
}
Map<Integer, Property> params = sqlBinds.getParamsMap();
if (params != null) {
for (Map.Entry<Integer, Property> entry : params.entrySet()) {
Property prop = entry.getValue();
ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue());
}
}
logger.info("prepare statement replace sql : {} ", stmt);
return stmt;
} catch (Exception exception) {
throw new TaskException("SQL task prepareStatementAndBind error", exception);
}
}
/**
* regular expressions match the contents between two specified strings
*
* @param content content
* @param rgex rgex
* @param sqlParamsMap sql params map
* @param paramsPropsMap params props map
*/
public void setSqlParamsMap(String content, String rgex, Map<Integer, Property> sqlParamsMap, Map<String, Property> paramsPropsMap) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | Pattern pattern = Pattern.compile(rgex);
Matcher m = pattern.matcher(content);
int index = 1;
while (m.find()) {
String paramName = m.group(1);
Property prop = paramsPropsMap.get(paramName);
if (prop == null) {
logger.error("setSqlParamsMap: No Property with paramName: {} is found in paramsPropsMap of task instance"
+ " with id: {}. So couldn't put Property in sqlParamsMap.", paramName, taskExecutionContext.getTaskInstanceId());
} else {
sqlParamsMap.put(index, prop);
index++;
logger.info("setSqlParamsMap: Property with paramName: {} put in sqlParamsMap of content {} successfully.", paramName, content);
}
}
}
/**
* print replace sql
*
* @param content content
* @param formatSql format sql
* @param rgex rgex
* @param sqlParamsMap sql params map
*/
private void printReplacedSql(String content, String formatSql, String rgex, Map<Integer, Property> sqlParamsMap) {
logger.info("after replace sql , preparing : {}", formatSql);
StringBuilder logPrint = new StringBuilder("replaced sql , parameters:");
if (sqlParamsMap == null) {
logger.info("printReplacedSql: sqlParamsMap is null."); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | } else {
for (int i = 1; i <= sqlParamsMap.size(); i++) {
logPrint.append(sqlParamsMap.get(i).getValue()).append("(").append(sqlParamsMap.get(i).getType()).append(")");
}
}
logger.info("Sql Params are {}", logPrint);
}
/**
* ready to execute SQL and parameter entity Map
*
* @return SqlBinds
*/
private SqlBinds getSqlAndSqlParamsMap(String sql) {
Map<Integer, Property> sqlParamsMap = new HashMap<>();
StringBuilder sqlBuilder = new StringBuilder();
Map<String, Property> paramsMap = ParamUtils.convert(taskExecutionContext, getParameters());
if (paramsMap == null) {
sqlBuilder.append(sql);
return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);
}
if (StringUtils.isNotEmpty(sqlParameters.getTitle())) {
String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(),
ParamUtils.convert(paramsMap));
logger.info("SQL title : {}", title);
sqlParameters.setTitle(title);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | sql = ParameterUtils.replaceScheduleTime(sql, taskExecutionContext.getScheduleTime());
String rgex = "['\"]*\\$\\{(.*?)\\}['\"]*";
setSqlParamsMap(sql, rgex, sqlParamsMap, paramsMap);
String rgexo = "['\"]*\\!\\{(.*?)\\}['\"]*";
sql = replaceOriginalValue(sql, rgexo, paramsMap);
// r
String formatSql = sql.replaceAll(rgex, "?");
sqlBuilder.append(formatSql);
// p
printReplacedSql(sql, formatSql, rgex, sqlParamsMap);
return new SqlBinds(sqlBuilder.toString(), sqlParamsMap);
}
private String replaceOriginalValue(String content, String rgex, Map<String, Property> sqlParamsMap) {
Pattern pattern = Pattern.compile(rgex);
while (true) {
Matcher m = pattern.matcher(content);
if (!m.find()) {
break;
}
String paramName = m.group(1);
String paramValue = sqlParamsMap.get(paramName).getValue();
content = m.replaceFirst(paramValue);
}
return content;
}
/**
* create function list
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,331 | [Bug] [TaskPlugin] PSQLException: statement has been closed when run sql task | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
model: dev-run, master-server、worker-server、api-server run by idea
dolphinscheduler-server worker.properties config:
`task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-python/pom.xml,./dolphinscheduler-task-plugin/dolphinscheduler-task-sql/pom.xml`
dolphinscheduler-task-sql pom.xml add jar dependency:
```
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
</dependency>`
```
exception:
```
[INFO] 2021-09-24 15:54:37.813 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[386] - prepare statement replace sql : select count(1) from t_ds_task_instance
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[202] - execute sql error: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.815 /home/csf/javapath/dolphinscheduler/logs/754963903078400_1/28/52.log:[153] - sql task error: org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
[ERROR] 2021-09-24 15:54:37.817 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[212] - task scheduler failure
org.postgresql.util.PSQLException: 这个 statement 已经被关闭。
at org.postgresql.jdbc.PgStatement.checkClosed(PgStatement.java:694)
at org.postgresql.jdbc.PgPreparedStatement.executeWithFlags(PgPreparedStatement.java:137)
at org.postgresql.jdbc.PgPreparedStatement.executeQuery(PgPreparedStatement.java:106)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.executeFuncAndSql(SqlTask.java:190)
at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.handle(SqlTask.java:147)
at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:198)
```
### What you expected to happen
run sql task success
### How to reproduce
create a process contains sql task with pgsql source, and run it
### Anything else
_No response_
### 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/6331 | https://github.com/apache/dolphinscheduler/pull/6334 | 89cc045961477168ac8ff74c5d6604b606214775 | 61c64619949b2098f7efcd2cfcc701ef98564083 | "2021-09-24T08:21:29Z" | java | "2021-09-24T10:39:04Z" | dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java | * @param udfFuncTenantCodeMap key is udf function,value is tenant code
* @param logger logger
* @return create function list
*/
public static List<String> createFuncs(Map<UdfFuncRequest, String> udfFuncTenantCodeMap, Logger logger) {
if (MapUtils.isEmpty(udfFuncTenantCodeMap)) {
logger.info("can't find udf function resource");
return null;
}
List<String> funcList = new ArrayList<>();
// b
buildTempFuncSql(funcList, new ArrayList<>(udfFuncTenantCodeMap.keySet()));
return funcList;
}
/**
* b
*
* @param sqls sql list
* @param udfFuncRequests udf function list
*/
private static void buildTempFuncSql(List<String> sqls, List<UdfFuncRequest> udfFuncRequests) {
if (CollectionUtils.isNotEmpty(udfFuncRequests)) {
for (UdfFuncRequest udfFuncRequest : udfFuncRequests) {
sqls.add(MessageFormat
.format(CREATE_FUNCTION_FORMAT, udfFuncRequest.getFuncName(), udfFuncRequest.getClassName()));
}
}
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | */
package org.apache.dolphinscheduler.server.master.runner;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.common.utils.NetUtils;
import org.apache.dolphinscheduler.common.utils.OSUtils;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.remote.NettyRemotingClient;
import org.apache.dolphinscheduler.remote.config.NettyClientConfig;
import org.apache.dolphinscheduler.server.master.config.MasterConfig;
import org.apache.dolphinscheduler.server.master.dispatch.executor.NettyExecutorManager;
import org.apache.dolphinscheduler.server.master.registry.MasterRegistryClient;
import org.apache.dolphinscheduler.server.master.registry.ServerNodeManager;
import org.apache.dolphinscheduler.service.alert.ProcessAlertManager;
import org.apache.dolphinscheduler.service.process.ProcessService;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* master scheduler thread
*/
@Service |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | public class MasterSchedulerService extends Thread {
/**
* logger of MasterSchedulerService
*/
private static final Logger logger = LoggerFactory.getLogger(MasterSchedulerService.class);
/**
* dolphinscheduler database interface
*/
@Autowired
private ProcessService processService;
/**
* zookeeper master client
*/
@Autowired
private MasterRegistryClient masterRegistryClient;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | * master config
*/
@Autowired
private MasterConfig masterConfig;
/**
* alert manager
*/
@Autowired
private ProcessAlertManager processAlertManager;
/**
* netty remoting client
*/
private NettyRemotingClient nettyRemotingClient;
@Autowired
NettyExecutorManager nettyExecutorManager;
/**
* master exec service
*/
private ThreadPoolExecutor masterExecService;
private ConcurrentHashMap<Integer, WorkflowExecuteThread> processInstanceExecMaps;
ConcurrentHashMap<Integer, ProcessInstance> processTimeoutCheckList = new ConcurrentHashMap<>();
ConcurrentHashMap<Integer, TaskInstance> taskTimeoutCheckList = new ConcurrentHashMap<>();
private StateWheelExecuteThread stateWheelExecuteThread;
/**
* constructor of MasterSchedulerService
*/
public void init(ConcurrentHashMap<Integer, WorkflowExecuteThread> processInstanceExecMaps) {
this.processInstanceExecMaps = processInstanceExecMaps;
this.masterExecService = (ThreadPoolExecutor) ThreadUtils.newDaemonFixedThreadExecutor("Master-Exec-Thread", masterConfig.getMasterExecThreads());
NettyClientConfig clientConfig = new NettyClientConfig(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | this.nettyRemotingClient = new NettyRemotingClient(clientConfig);
stateWheelExecuteThread = new StateWheelExecuteThread(processTimeoutCheckList,
taskTimeoutCheckList,
this.processInstanceExecMaps,
masterConfig.getStateWheelInterval() * Constants.SLEEP_TIME_MILLIS);
}
@Override
public synchronized void start() {
super.setName("MasterSchedulerService");
super.start();
this.stateWheelExecuteThread.start();
}
public void close() {
masterExecService.shutdown();
boolean terminated = false;
try {
terminated = masterExecService.awaitTermination(5, TimeUnit.SECONDS);
} catch (InterruptedException ignore) {
Thread.currentThread().interrupt();
}
if (!terminated) {
logger.warn("masterExecService shutdown without terminated, increase await time");
}
nettyRemotingClient.close();
logger.info("master schedule service stopped...");
}
/**
* run of MasterSchedulerService
*/
@Override |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | public void run() {
logger.info("master scheduler started");
while (Stopper.isRunning()) {
try {
boolean runCheckFlag = OSUtils.checkResource(masterConfig.getMasterMaxCpuloadAvg(), masterConfig.getMasterReservedMemory());
if (!runCheckFlag) {
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
continue;
}
scheduleProcess();
} catch (Exception e) {
logger.error("master scheduler thread error", e);
}
}
}
/**
* 1. get command by slot
* 2. donot handle command if slot is empty
*
* @throws Exception
*/
private void scheduleProcess() throws Exception {
int activeCount = masterExecService.getActiveCount();
Command command = findOneCommand();
if (command != null) {
logger.info("find one command: id: {}, type: {}", command.getId(), command.getCommandType());
try {
ProcessInstance processInstance = processService.handleCommand(logger,
getLocalAddress(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | this.masterConfig.getMasterExecThreads() - activeCount, command);
if (processInstance != null) {
WorkflowExecuteThread workflowExecuteThread = new WorkflowExecuteThread(
processInstance
, processService
, nettyExecutorManager
, processAlertManager
, masterConfig
, taskTimeoutCheckList);
this.processInstanceExecMaps.put(processInstance.getId(), workflowExecuteThread);
if (processInstance.getTimeout() > 0) {
this.processTimeoutCheckList.put(processInstance.getId(), processInstance);
}
logger.info("command {} process {} start...",
command.getId(), processInstance.getId());
masterExecService.execute(workflowExecuteThread);
}
} catch (Exception e) {
logger.error("scan command error ", e);
processService.moveToErrorCommand(command, e.toString());
}
} else {
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
}
}
private Command findOneCommand() {
int pageNumber = 0;
Command result = null;
while (Stopper.isRunning()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterSchedulerService.java | if (ServerNodeManager.MASTER_SIZE == 0) {
return null;
}
List<Command> commandList = processService.findCommandPage(ServerNodeManager.MASTER_SIZE, pageNumber);
if (commandList.size() == 0) {
return null;
}
for (Command command : commandList) {
int slot = ServerNodeManager.getSlot();
if (ServerNodeManager.MASTER_SIZE != 0
&& command.getId() % ServerNodeManager.MASTER_SIZE == slot) {
result = command;
break;
}
}
if (result != null) {
logger.info("find command {}, slot:{} :",
result.getId(),
ServerNodeManager.getSlot());
break;
}
pageNumber += 1;
}
return result;
}
private String getLocalAddress() {
return NetUtils.getAddr(masterConfig.getListenPort());
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.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_START_NODE_NAMES;
mport statc org.apache.dolphnscheduler.common.Constants.DEFAULT_WORKER_GROUP;
mport statc org.apache.dolphnscheduler.common.Constants.SEC_2_MINUTES_TIME_UNIT;
mport org.apache.dolphnscheduler.common.Constants;
mport org.apache.dolphnscheduler.common.enums.CommandType;
mport org.apache.dolphnscheduler.common.enums.DependResult;
mport org.apache.dolphnscheduler.common.enums.Drect;
mport org.apache.dolphnscheduler.common.enums.ExecutonStatus;
mport org.apache.dolphnscheduler.common.enums.FalureStrategy;
mport org.apache.dolphnscheduler.common.enums.Flag; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 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.TaskTmeoutStrategy;
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.process.Property;
mport org.apache.dolphnscheduler.common.thread.ThreadUtls;
mport org.apache.dolphnscheduler.common.utls.CollectonUtls;
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.Envronment;
mport org.apache.dolphnscheduler.dao.entty.ProcessDefnton;
mport org.apache.dolphnscheduler.dao.entty.ProcessInstance;
mport org.apache.dolphnscheduler.dao.entty.ProjectUser;
mport org.apache.dolphnscheduler.dao.entty.Schedule;
mport org.apache.dolphnscheduler.dao.entty.TaskDefnton;
mport org.apache.dolphnscheduler.dao.entty.TaskInstance;
mport org.apache.dolphnscheduler.dao.utls.DagHelper;
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.runner.task.ITaskProcessor; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 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.process.ProcessServce;
mport org.apache.dolphnscheduler.servce.quartz.cron.CronUtls;
mport org.apache.dolphnscheduler.servce.queue.PeerTaskInstancePrortyQueue;
mport org.apache.commons.lang.StrngUtls;
mport java.utl.ArrayLst;
mport java.utl.Arrays;
mport java.utl.Collecton;
mport java.utl.Date;
mport java.utl.HashMap;
mport java.utl.Iterator;
mport java.utl.Lst;
mport java.utl.Map;
mport java.utl.Objects;
mport java.utl.Set;
mport java.utl.concurrent.ConcurrentHashMap;
mport java.utl.concurrent.ConcurrentLnkedQueue;
mport java.utl.concurrent.ExecutorServce;
mport org.slf4j.Logger;
mport org.slf4j.LoggerFactory;
mport com.google.common.collect.HashBasedTable;
mport com.google.common.collect.Lsts;
mport com.google.common.collect.Table;
/**
* master exec thread,splt dag
*/
publc class WorkflowExecuteThread mplements Runnable {
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * logger of WorkflowExecuteThread
*/
prvate statc fnal Logger logger = LoggerFactory.getLogger(WorkflowExecuteThread.class);
/**
* runng TaskNode
*/
prvate fnal Map<Integer, ITaskProcessor> actveTaskProcessorMaps = new ConcurrentHashMap<>();
/**
* task exec servce
*/
prvate fnal ExecutorServce taskExecServce;
/**
* process nstance
*/
prvate ProcessInstance processInstance;
/**
* submt falure nodes
*/
prvate boolean taskFaledSubmt = false;
/**
* recover node d lst
*/
prvate Lst<TaskInstance> recoverNodeIdLst = new ArrayLst<>();
/**
* error task lst
*/
prvate Map<Strng, TaskInstance> errorTaskLst = new ConcurrentHashMap<>();
/**
* complete task lst
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | prvate Map<Strng, TaskInstance> completeTaskLst = new ConcurrentHashMap<>();
/**
* ready to submt task queue
*/
prvate PeerTaskInstancePrortyQueue readyToSubmtTaskQueue = new PeerTaskInstancePrortyQueue();
/**
* depend faled task map
*/
prvate Map<Strng, TaskInstance> dependFaledTask = new ConcurrentHashMap<>();
/**
* forbdden task map
*/
prvate Map<Strng, TaskNode> forbddenTaskLst = new ConcurrentHashMap<>();
/**
* skp task map
*/
prvate Map<Strng, TaskNode> skpTaskNodeLst = new ConcurrentHashMap<>();
/**
* recover tolerance fault task lst
*/
prvate Lst<TaskInstance> recoverToleranceFaultTaskLst = new ArrayLst<>();
/**
* alert manager
*/
prvate ProcessAlertManager processAlertManager;
/**
* the object of DAG
*/
prvate DAG<Strng, TaskNode, TaskNodeRelaton> dag;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * process servce
*/
prvate ProcessServce processServce;
/**
* master confg
*/
prvate MasterConfg masterConfg;
/**
*
*/
prvate NettyExecutorManager nettyExecutorManager;
prvate ConcurrentLnkedQueue<StateEvent> stateEvents = new ConcurrentLnkedQueue<>();
prvate Lst<Date> complementLstDate = Lsts.newLnkedLst();
prvate Table<Integer, Long, TaskInstance> taskInstanceHashMap = HashBasedTable.create();
prvate ProcessDefnton processDefnton;
prvate Strng key;
prvate ConcurrentHashMap<Integer, TaskInstance> taskTmeoutCheckLst;
/**
* start flag, true: start nodes submt completely
*
*/
prvate boolean sStart = false;
/**
* constructor of WorkflowExecuteThread
*
* @param processInstance processInstance
* @param processServce processServce
* @param nettyExecutorManager nettyExecutorManager
* @param taskTmeoutCheckLst
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | publc WorkflowExecuteThread(ProcessInstance processInstance
, ProcessServce processServce
, NettyExecutorManager nettyExecutorManager
, ProcessAlertManager processAlertManager
, MasterConfg masterConfg
, ConcurrentHashMap<Integer, TaskInstance> taskTmeoutCheckLst) {
ths.processServce = processServce;
ths.processInstance = processInstance;
ths.masterConfg = masterConfg;
nt masterTaskExecNum = masterConfg.getMasterExecTaskNum();
ths.taskExecServce = ThreadUtls.newDaemonFxedThreadExecutor("Master-Task-Exec-Thread",
masterTaskExecNum);
ths.nettyExecutorManager = nettyExecutorManager;
ths.processAlertManager = processAlertManager;
ths.taskTmeoutCheckLst = taskTmeoutCheckLst;
}
@Overrde
publc vod run() {
try {
startProcess();
handleEvents();
} catch (Excepton e) {
logger.error("handler error:", e);
}
}
/**
* the process start nodes are submtted completely.
* @return
*/
publc boolean sStart() { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | return ths.sStart;
}
prvate vod handleEvents() {
whle (ths.stateEvents.sze() > 0) {
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("{}_{}_{}",
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.toStrng());
return false;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | ths.stateEvents.add(stateEvent);
return true;
}
publc nt eventSze() {
return ths.stateEvents.sze();
}
publc ProcessInstance getProcessInstance() {
return ths.processInstance;
}
prvate boolean stateEventHandler(StateEvent stateEvent) {
logger.nfo("process event: {}", stateEvent.toStrng());
f (!checkStateEvent(stateEvent)) {
return false;
}
boolean result = false;
swtch (stateEvent.getType()) {
case PROCESS_STATE_CHANGE:
result = processStateChangeHandler(stateEvent);
break;
case TASK_STATE_CHANGE:
result = taskStateChangeHandler(stateEvent);
break;
case PROCESS_TIMEOUT:
result = processTmeout();
break;
case TASK_TIMEOUT:
result = taskTmeout(stateEvent);
break;
default:
break; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
f (result) {
ths.stateEvents.remove(stateEvent);
}
return result;
}
prvate boolean taskTmeout(StateEvent stateEvent) {
f (taskInstanceHashMap.contansRow(stateEvent.getTaskInstanceId())) {
return true;
}
TaskInstance taskInstance = taskInstanceHashMap
.row(stateEvent.getTaskInstanceId())
.values()
.terator().next();
f (TmeoutFlag.CLOSE == taskInstance.getTaskDefne().getTmeoutFlag()) {
return true;
}
TaskTmeoutStrategy taskTmeoutStrategy = taskInstance.getTaskDefne().getTmeoutNotfyStrategy();
f (TaskTmeoutStrategy.FAILED == taskTmeoutStrategy) {
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(stateEvent.getTaskInstanceId());
taskProcessor.acton(TaskActon.TIMEOUT);
return false;
} else {
processAlertManager.sendTaskTmeoutAlert(processInstance, taskInstance, taskInstance.getTaskDefne());
return true;
}
}
prvate boolean processTmeout() {
ths.processAlertManager.sendProcessTmeoutAlert(ths.processInstance, ths.processDefnton);
return true; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
prvate boolean taskStateChangeHandler(StateEvent stateEvent) {
TaskInstance task = processServce.fndTaskInstanceById(stateEvent.getTaskInstanceId());
f (stateEvent.getExecutonStatus().typeIsFnshed()) {
taskFnshed(task);
} else f (actveTaskProcessorMaps.contansKey(stateEvent.getTaskInstanceId())) {
ITaskProcessor TaskProcessor = actveTaskProcessorMaps.get(stateEvent.getTaskInstanceId());
TaskProcessor.run();
f (TaskProcessor.taskState().typeIsFnshed()) {
task = processServce.fndTaskInstanceById(stateEvent.getTaskInstanceId());
taskFnshed(task);
}
} else {
logger.error("state handler error: {}", stateEvent.toStrng());
}
return true;
}
prvate vod taskFnshed(TaskInstance task) {
logger.nfo("work flow {} task {} state:{} ",
processInstance.getId(),
task.getId(),
task.getState());
f (task.taskCanRetry()) {
addTaskToStandByLst(task);
return;
}
ProcessInstance processInstance = processServce.fndProcessInstanceById(ths.processInstance.getId());
completeTaskLst.put(task.getName(), task);
actveTaskProcessorMaps.remove(task.getId());
taskTmeoutCheckLst.remove(task.getId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | f (task.getState().typeIsSuccess()) {
processInstance.setVarPool(task.getVarPool());
processServce.saveProcessInstance(processInstance);
submtPostNode(task.getName());
} else f (task.getState().typeIsFalure()) {
f (task.sCondtonsTask()
|| DagHelper.haveCondtonsAfterNode(task.getName(), dag)) {
submtPostNode(task.getName());
} else {
errorTaskLst.put(task.getName(), task);
f (processInstance.getFalureStrategy() == FalureStrategy.END) {
kllAllTasks();
}
}
}
ths.updateProcessInstanceState();
}
prvate boolean checkStateEvent(StateEvent stateEvent) {
f (ths.processInstance.getId() != stateEvent.getProcessInstanceId()) {
logger.error("msmatch process nstance d: {}, state event:{}",
ths.processInstance.getId(),
stateEvent.toStrng());
return false;
}
return true;
}
prvate boolean processStateChangeHandler(StateEvent stateEvent) {
try {
logger.nfo("process:{} state {} change to {}", processInstance.getId(), processInstance.getState(), stateEvent.getExecutonStatus());
processInstance = processServce.fndProcessInstanceById(ths.processInstance.getId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | f (processComplementData()) {
return true;
}
f (stateEvent.getExecutonStatus().typeIsFnshed()) {
endProcess();
}
f (stateEvent.getExecutonStatus() == ExecutonStatus.READY_STOP) {
kllAllTasks();
}
return true;
} catch (Excepton e) {
logger.error("process state change error:", e);
}
return true;
}
prvate boolean processComplementData() throws Excepton {
f (!needComplementProcess()) {
return false;
}
Date scheduleDate = processInstance.getScheduleTme();
f (scheduleDate == null) {
scheduleDate = complementLstDate.get(0);
} else f (processInstance.getState().typeIsFnshed()) {
endProcess();
nt ndex = complementLstDate.ndexOf(scheduleDate);
f (ndex >= complementLstDate.sze() - 1 || !processInstance.getState().typeIsSuccess()) {
return false;
}
scheduleDate = complementLstDate.get(ndex + 1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | processInstance.setId(0);
}
processInstance.setScheduleTme(scheduleDate);
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);
processInstance.setCommandParam(JSONUtls.toJsonStrng(cmdParam));
}
processInstance.setState(ExecutonStatus.RUNNING_EXECUTION);
processInstance.setGlobalParams(ParameterUtls.curngGlobalParams(
processDefnton.getGlobalParamMap(),
processDefnton.getGlobalParamLst(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTme()));
processInstance.setStartTme(new Date());
processInstance.setEndTme(null);
processServce.saveProcessInstance(processInstance);
ths.taskInstanceHashMap.clear();
startProcess();
return true;
}
prvate boolean needComplementProcess() {
f (processInstance.sComplementData()
&& Flag.NO == processInstance.getIsSubProcess()) {
return true;
}
return false;
}
prvate vod startProcess() throws Excepton {
f (ths.taskInstanceHashMap.sze() == 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | sStart = false;
buldFlowDag();
ntTaskQueue();
submtPostNode(null);
sStart = true;
}
}
/**
* process end handle
*/
prvate vod endProcess() {
ths.stateEvents.clear();
processInstance.setEndTme(new Date());
processServce.updateProcessInstance(processInstance);
f (processInstance.getState().typeIsWatngThread()) {
processServce.createRecoveryWatngThreadCommand(null, processInstance);
}
Lst<TaskInstance> taskInstances = processServce.fndValdTaskLstByProcessId(processInstance.getId());
ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId());
processAlertManager.sendAlertProcessInstance(processInstance, taskInstances, projectUser);
}
/**
* generate process dag
*
* @throws Excepton excepton
*/
prvate vod buldFlowDag() throws Excepton {
f (ths.dag != null) {
return;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
processInstance.getProcessDefntonVerson());
recoverNodeIdLst = getStartTaskInstanceLst(processInstance.getCommandParam());
Lst<TaskNode> taskNodeLst =
processServce.transformTask(processServce.fndRelatonByCode(processDefnton.getProjectCode(), processDefnton.getCode()), Lsts.newArrayLst());
forbddenTaskLst.clear();
taskNodeLst.forEach(taskNode -> {
f (taskNode.sForbdden()) {
forbddenTaskLst.put(taskNode.getName(), taskNode);
}
});
Lst<Strng> recoveryNameLst = getRecoveryNodeNameLst();
Lst<Strng> startNodeNameLst = parseStartNodeName(processInstance.getCommandParam());
ProcessDag processDag = generateFlowDag(taskNodeLst,
startNodeNameLst, recoveryNameLst, 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();
dependFaledTask.clear(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | completeTaskLst.clear();
errorTaskLst.clear();
Lst<TaskInstance> taskInstanceLst = processServce.fndValdTaskLstByProcessId(processInstance.getId());
for (TaskInstance task : taskInstanceLst) {
f (task.sTaskComplete()) {
completeTaskLst.put(task.getName(), task);
}
f (task.sCondtonsTask() || DagHelper.haveCondtonsAfterNode(task.getName(), dag)) {
contnue;
}
f (task.getState().typeIsFalure() && !task.taskCanRetry()) {
errorTaskLst.put(task.getName(), task);
}
}
f (complementLstDate.sze() == 0 && needComplementProcess()) {
Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam());
Date startDate = DateUtls.getScheduleDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date endDate = DateUtls.getScheduleDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
f (startDate.after(endDate)) {
Date tmp = startDate;
startDate = endDate;
endDate = tmp;
}
Lst<Schedule> schedules = processServce.queryReleaseSchedulerLstByProcessDefntonCode(processInstance.getProcessDefntonCode());
complementLstDate.addAll(CronUtls.getSelfFreDateLst(startDate, endDate, schedules));
logger.nfo(" process defnton code:{} complement data: {}",
processInstance.getProcessDefntonCode(), complementLstDate.toStrng());
}
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * submt task to execute
*
* @param taskInstance task nstance
* @return TaskInstance
*/
prvate TaskInstance submtTaskExec(TaskInstance taskInstance) {
try {
ITaskProcessor taskProcessor = TaskProcessorFactory.getTaskProcessor(taskInstance.getTaskType());
f (taskInstance.getState() == ExecutonStatus.RUNNING_EXECUTION
&& taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) {
notfyProcessHostUpdate(taskInstance);
}
boolean submt = taskProcessor.submt(taskInstance, processInstance, masterConfg.getMasterTaskCommtRetryTmes(), masterConfg.getMasterTaskCommtInterval());
f (submt) {
ths.taskInstanceHashMap.put(taskInstance.getId(), taskInstance.getTaskCode(), taskInstance);
actveTaskProcessorMaps.put(taskInstance.getId(), taskProcessor);
taskProcessor.run();
addTmeoutCheck(taskInstance);
TaskDefnton taskDefnton = processServce.fndTaskDefnton(
taskInstance.getTaskCode(),
taskInstance.getTaskDefntonVerson());
taskInstance.setTaskDefne(taskDefnton);
f (taskProcessor.taskState().typeIsFnshed()) {
StateEvent stateEvent = new StateEvent();
stateEvent.setProcessInstanceId(ths.processInstance.getId());
stateEvent.setTaskInstanceId(taskInstance.getId());
stateEvent.setExecutonStatus(taskProcessor.taskState());
stateEvent.setType(StateEventType.TASK_STATE_CHANGE);
ths.stateEvents.add(stateEvent);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | return taskInstance;
} else {
logger.error("process d:{} name:{} submt standby task d:{} name:{} faled!",
processInstance.getId(), processInstance.getName(),
taskInstance.getId(), taskInstance.getName());
return null;
}
} 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());
nettyExecutorManager.doExecute(host, hostUpdateCommand.convert2Command());
} catch (Excepton e) {
logger.error("notfy process host update", e);
}
}
prvate vod addTmeoutCheck(TaskInstance taskInstance) {
TaskDefnton taskDefnton = processServce.fndTaskDefnton(
taskInstance.getTaskCode(),
taskInstance.getTaskDefntonVerson() |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | );
taskInstance.setTaskDefne(taskDefnton);
f (TmeoutFlag.OPEN == taskDefnton.getTmeoutFlag()) {
ths.taskTmeoutCheckLst.put(taskInstance.getId(), taskInstance);
return;
}
f (taskInstance.sDependTask() || taskInstance.sSubProcess()) {
ths.taskTmeoutCheckLst.put(taskInstance.getId(), taskInstance);
}
}
/**
* 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> taskInstanceLst = processServce.fndValdTaskLstByProcessId(ths.processInstance.getId());
for (TaskInstance taskInstance : taskInstanceLst) {
f (taskInstance.getTaskCode() == taskCode && taskInstance.getTaskDefntonVerson() == taskVerson) {
return taskInstance;
}
}
return null;
}
/**
* encapsulaton task
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * @param processInstance process nstance
* @param taskNode taskNode
* @return TaskInstance
*/
prvate TaskInstance createTaskInstance(ProcessInstance processInstance, TaskNode taskNode) {
TaskInstance taskInstance = fndTaskIfExsts(taskNode.getCode(), taskNode.getVerson());
f (taskInstance == null) {
taskInstance = new TaskInstance();
taskInstance.setTaskCode(taskNode.getCode());
taskInstance.setTaskDefntonVerson(taskNode.getVerson());
taskInstance.setName(taskNode.getName());
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.setRetryTmes(0);
taskInstance.setMaxRetryTmes(taskNode.getMaxRetryTmes());
taskInstance.setRetryInterval(taskNode.getRetryInterval()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | taskInstance.setTaskParams(taskNode.getTaskParams());
f (taskNode.getTaskInstanceProrty() == null) {
taskInstance.setTaskInstanceProrty(Prorty.MEDIUM);
} else {
taskInstance.setTaskInstanceProrty(taskNode.getTaskInstanceProrty());
}
Strng processWorkerGroup = processInstance.getWorkerGroup();
processWorkerGroup = StrngUtls.sBlank(processWorkerGroup) ? DEFAULT_WORKER_GROUP : processWorkerGroup;
Strng taskWorkerGroup = StrngUtls.sBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup();
Long processEnvronmentCode = Objects.sNull(processInstance.getEnvronmentCode()) ? -1 : processInstance.getEnvronmentCode();
Long taskEnvronmentCode = Objects.sNull(taskNode.getEnvronmentCode()) ? processEnvronmentCode : taskNode.getEnvronmentCode();
f (!processWorkerGroup.equals(DEFAULT_WORKER_GROUP) && taskWorkerGroup.equals(DEFAULT_WORKER_GROUP)) {
taskInstance.setWorkerGroup(processWorkerGroup);
taskInstance.setEnvronmentCode(processEnvronmentCode);
} else {
taskInstance.setWorkerGroup(taskWorkerGroup);
taskInstance.setEnvronmentCode(taskEnvronmentCode);
}
f (!taskInstance.getEnvronmentCode().equals(-1L)) {
Envronment envronment = processServce.fndEnvronmentByCode(taskInstance.getEnvronmentCode());
f (Objects.nonNull(envronment) && StrngUtls.sNotEmpty(envronment.getConfg())) {
taskInstance.setEnvronmentConfg(envronment.getConfg());
}
}
taskInstance.setDelayTme(taskNode.getDelayTme());
}
return taskInstance; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
publc vod getPreVarPool(TaskInstance taskInstance, Set<Strng> preTask) {
Map<Strng, Property> allProperty = new HashMap<>();
Map<Strng, TaskInstance> allTaskInstance = new HashMap<>();
f (CollectonUtls.sNotEmpty(preTask)) {
for (Strng preTaskName : preTask) {
TaskInstance preTaskInstance = completeTaskLst.get(preTaskName);
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()));
}
}
}
prvate vod setVarPoolValue(Map<Strng, Property> allProperty, Map<Strng, TaskInstance> allTaskInstance, TaskInstance preTaskInstance, Property thsProperty) {
thsProperty.setDrect(Drect.IN);
Strng proName = thsProperty.getProp();
f (allProperty.contansKey(proName)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | 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);
}
}
prvate vod submtPostNode(Strng parentNodeName) {
Set<Strng> submtTaskNodeLst = DagHelper.parsePostNodes(parentNodeName, skpTaskNodeLst, dag, completeTaskLst);
Lst<TaskInstance> taskInstances = new ArrayLst<>();
for (Strng taskNode : submtTaskNodeLst) {
TaskNode taskNodeObject = dag.getNode(taskNode);
f (taskInstanceHashMap.contansColumn(taskNodeObject.getCode())) {
contnue; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
TaskInstance task = createTaskInstance(processInstance, taskNodeObject);
taskInstances.add(task);
}
for (TaskInstance task : taskInstances) {
f (readyToSubmtTaskQueue.contans(task)) {
contnue;
}
f (completeTaskLst.contansKey(task.getName())) {
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());
} else {
addTaskToStandByLst(task);
}
}
submtStandByTask();
updateProcessInstanceState();
}
/**
* determne whether the dependences of the task node are complete
*
* @return DependResult
*/
prvate DependResult sTaskDepsComplete(Strng taskName) {
Collecton<Strng> startNodes = dag.getBegnNode(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | f (startNodes.contans(taskName)) {
return DependResult.SUCCESS;
}
TaskNode taskNode = dag.getNode(taskName);
Lst<Strng> depNameLst = taskNode.getDepLst();
for (Strng depsNode : depNameLst) {
f (!dag.contansNode(depsNode)
|| forbddenTaskLst.contansKey(depsNode)
|| skpTaskNodeLst.contansKey(depsNode)) {
contnue;
}
f (!completeTaskLst.contansKey(depsNode)) {
return DependResult.WAITING;
}
ExecutonStatus depTaskState = completeTaskLst.get(depsNode).getState();
f (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) {
return DependResult.NON_EXEC;
}
f (taskNode.sCondtonsTask()) {
contnue;
}
f (!dependTaskSuccess(depsNode, taskName)) {
return DependResult.FAILED;
}
}
logger.nfo("taskName: {} completeDependTaskLst: {}", taskName, Arrays.toStrng(completeTaskLst.keySet().toArray()));
return DependResult.SUCCESS;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.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, skpTaskNodeLst, dag, completeTaskLst);
f (!nextTaskLst.contans(nextNodeName)) {
return false;
}
} else {
ExecutonStatus depTaskState = completeTaskLst.get(dependNodeName).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) {
Lst<TaskInstance> resultLst = new ArrayLst<>();
for (Map.Entry<Strng, TaskInstance> entry : completeTaskLst.entrySet()) {
f (entry.getValue().getState() == state) {
resultLst.add(entry.getValue());
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
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.DELAY_EXECUTION) {
return state;
} else {
return ExecutonStatus.RUNNING_EXECUTION;
}
}
/**
* exsts falure task,contans submt falure、dependency falure,execute falure(retry after)
*
* @return Boolean whether has faled task
*/
prvate boolean hasFaledTask() {
f (ths.taskFaledSubmt) {
return true;
}
f (ths.errorTaskLst.sze() > 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | return true;
}
return ths.dependFaledTask.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;
}
}
return false;
}
/**
* 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);
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * 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)
|| !sComplementEnd()
|| readyToSubmtTaskQueue.sze() > 0) {
return ExecutonStatus.PAUSE;
} else {
return ExecutonStatus.SUCCESS;
}
}
/**
* generate the latest process nstance status by the tasks state
*
* @param nstance
* @return process nstance executon status
*/
prvate ExecutonStatus getProcessInstanceState(ProcessInstance nstance) {
ExecutonStatus state = nstance.getState();
f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) {
// actve |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | return runnngState(state);
}
// process falure
f (processFaled()) {
return ExecutonStatus.FAILURE;
}
// 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);
f (CollectonUtls.sNotEmpty(stopLst)
|| CollectonUtls.sNotEmpty(kllLst)
|| !sComplementEnd()) {
return ExecutonStatus.STOP;
} else {
return ExecutonStatus.SUCCESS;
}
}
// success
f (state == ExecutonStatus.RUNNING_EXECUTION) {
Lst<TaskInstance> kllTasks = getCompleteTaskByState(ExecutonStatus.KILL);
f (readyToSubmtTaskQueue.sze() > 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | //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 {
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;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | /**
* updateProcessInstance process nstance state
* after each batch of tasks s executed, the status of the process nstance s updated
*/
prvate vod updateProcessInstanceState() {
ProcessInstance nstance = processServce.fndProcessInstanceById(processInstance.getId());
ExecutonStatus state = getProcessInstanceState(nstance);
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());
nstance.setState(state);
processServce.updateProcessInstance(nstance);
processInstance = nstance;
StateEvent stateEvent = new StateEvent();
stateEvent.setExecutonStatus(processInstance.getState());
stateEvent.setProcessInstanceId(ths.processInstance.getId());
stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE);
ths.processStateChangeHandler(stateEvent);
}
}
/**
* get task dependency result
*
* @param taskInstance task nstance
* @return DependResult
*/
prvate DependResult getDependResultForTask(TaskInstance taskInstance) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | return sTaskDepsComplete(taskInstance.getName());
}
/**
* add task to standby lst
*
* @param taskInstance task nstance
*/
prvate vod addTaskToStandByLst(TaskInstance taskInstance) {
logger.nfo("add task to stand by lst: {}", taskInstance.getName());
try {
readyToSubmtTaskQueue.put(taskInstance);
} catch (Excepton e) {
logger.error("add task nstance to readyToSubmtTaskQueue error, taskName: {}", taskInstance.getName(), 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 {
readyToSubmtTaskQueue.remove(taskInstance);
} catch (Excepton e) {
logger.error("remove task nstance from readyToSubmtTaskQueue error, task d:{}, Name: {}",
taskInstance.getId(),
taskInstance.getName(), e); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | }
}
/**
* 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());
for (nt taskId : actveTaskProcessorMaps.keySet()) {
TaskInstance taskInstance = processServce.fndTaskInstanceById(taskId);
f (taskInstance == null || taskInstance.getState().typeIsFnshed()) {
contnue;
}
ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskId);
taskProcessor.acton(TaskActon.STOP);
f (taskProcessor.taskState().typeIsFnshed()) {
StateEvent stateEvent = new StateEvent(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | stateEvent.setType(StateEventType.TASK_STATE_CHANGE);
stateEvent.setProcessInstanceId(ths.processInstance.getId());
stateEvent.setTaskInstanceId(taskInstance.getId());
stateEvent.setExecutonStatus(taskProcessor.taskState());
ths.addStateEvent(stateEvent);
}
}
}
publc boolean workFlowFnsh() {
return ths.processInstance.getState().typeIsFnshed();
}
/**
* whether the retry nterval s tmed out
*
* @param taskInstance task nstance
* @return Boolean
*/
prvate boolean retryTaskIntervalOverTme(TaskInstance taskInstance) {
f (taskInstance.getState() != ExecutonStatus.FAILURE) {
return true;
}
f (taskInstance.getId() == 0
||
taskInstance.getMaxRetryTmes() == 0
||
taskInstance.getRetryInterval() == 0) {
return true;
}
Date now = new Date();
long faledTmeInterval = DateUtls.dfferSec(now, taskInstance.getEndTme()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | // task retry does not over tme, return false
return taskInstance.getRetryInterval() * SEC_2_MINUTES_TIME_UNIT < faledTmeInterval;
}
/**
* handlng the lst of tasks to be submtted
*/
prvate vod submtStandByTask() {
try {
nt length = readyToSubmtTaskQueue.sze();
for (nt = 0; < length; ++) {
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);
completeTaskLst.put(task.getName(), task);
submtPostNode(task.getName());
contnue;
}
}
//nt var
f (task.sFrstRun()) {
//get pre
Set<Strng> preTask = dag.getPrevousNodes(task.getName()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | getPreVarPool(task, preTask);
}
DependResult dependResult = getDependResultForTask(task);
f (DependResult.SUCCESS == dependResult) {
f (retryTaskIntervalOverTme(task)) {
TaskInstance taskInstance = submtTaskExec(task);
f (taskInstance == null) {
ths.taskFaledSubmt = true;
} else {
removeTaskFromStandbyLst(task);
}
}
} else f (DependResult.FAILED == dependResult) {
// f the
dependFaledTask.put(task.getName(), task);
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
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | * @param taskId task d
* @return recovery task nstance
*/
prvate TaskInstance getRecoveryTaskInstance(Strng taskId) {
f (!StrngUtls.sNotEmpty(taskId)) {
return null;
}
try {
Integer ntId = Integer.valueOf(taskId);
TaskInstance task = processServce.fndTaskInstanceById(ntId);
f (task == null) {
logger.error("start node d cannot be found: {}", taskId);
} else {
return task;
}
} catch (Excepton e) {
logger.error("get recovery task nstance faled ", e);
}
return null;
}
/**
* 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)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | Strng[] dLst = paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING).splt(Constants.COMMA);
for (Strng nodeId : dLst) {
TaskInstance task = getRecoveryTaskInstance(nodeId);
f (task != null) {
nstanceLst.add(task);
}
}
}
return nstanceLst;
}
/**
* parse "StartNodeNameLst" from cmd param
*
* @param cmdParam command param
* @return start node name lst
*/
prvate Lst<Strng> parseStartNodeName(Strng cmdParam) {
Lst<Strng> startNodeNameLst = new ArrayLst<>();
Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam);
f (paramMap == null) {
return startNodeNameLst;
}
f (paramMap.contansKey(CMD_PARAM_START_NODE_NAMES)) {
startNodeNameLst = Arrays.asLst(paramMap.get(CMD_PARAM_START_NODE_NAMES).splt(Constants.COMMA));
}
return startNodeNameLst;
}
/**
* generate start node name lst from parsng command param;
* f "StartNodeIdLst" exsts n command param, return StartNodeIdLst |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java | *
* @return recovery node name lst
*/
prvate Lst<Strng> getRecoveryNodeNameLst() {
Lst<Strng> recoveryNodeNameLst = new ArrayLst<>();
f (CollectonUtls.sNotEmpty(recoverNodeIdLst)) {
for (TaskInstance task : recoverNodeIdLst) {
recoveryNodeNameLst.add(task.getName());
}
}
return recoveryNodeNameLst;
}
/**
* generate flow dag
*
* @param totalTaskNodeLst total task node lst
* @param startNodeNameLst start node name lst
* @param recoveryNodeNameLst recovery node name lst
* @param depNodeType depend node type
* @return ProcessDag process dag
* @throws Excepton excepton
*/
publc ProcessDag generateFlowDag(Lst<TaskNode> totalTaskNodeLst,
Lst<Strng> startNodeNameLst,
Lst<Strng> recoveryNodeNameLst,
TaskDependType depNodeType) throws Excepton {
return DagHelper.generateFlowDag(totalTaskNodeLst, startNodeNameLst, recoveryNodeNameLst, depNodeType);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.service.process;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_EMPTY_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_FATHER_PARAMS; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_ID;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.YYYY_MM_DD_HH_MM_SS;
import static java.util.stream.Collectors.toSet;
import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.Direct;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.ResourceType;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.DateInterval;
import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.process.ProcessDag;
import org.apache.dolphinscheduler.common.process.Property;
import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters;
import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter;
import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils;
import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils.SnowFlakeException;
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.DagData;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.ErrorCommand;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.utils.DagHelper;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.log.LogClientService;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.facebook.presto.jdbc.internal.guava.collect.Lists;
import com.fasterxml.jackson.databind.node.ObjectNode;
/**
* process relative dao that some mappers in this.
*/
@Component
public class ProcessService {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.DELAY_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
@Autowired
private UserMapper userMapper;
@Autowired
private ProcessDefinitionMapper processDefineMapper;
@Autowired
private ProcessDefinitionLogMapper processDefineLogMapper;
@Autowired |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | private ProcessInstanceMapper processInstanceMapper;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper;
@Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
private ProcessTaskRelationMapper processTaskRelationMapper;
@Autowired |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
private EnvironmentMapper environmentMapper;
/**
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param logger logger
* @param host host
* @param validThreadNum validThreadNum
* @param command found command
* @return process instance
*/
@Transactional(rollbackFor = Exception.class)
public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, Command command) {
ProcessInstance processInstance = constructProcessInstance(command, host);
if (processInstance == null) {
logger.error("scan command, command parameter is error: {}", command);
moveToErrorCommand(command, "process instance is null");
return null;
}
if (!checkThreadNum(command, validThreadNum)) {
logger.info("there is not enough thread for this command: {}", command);
return setWaitingThreadProcess(command, processInstance);
}
processInstance.setCommandType(command.getCommandType());
processInstance.addHistoryCmd(command.getCommandType());
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
this.commandMapper.deleteById(command.getId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return processInstance;
}
/**
* save error command, and delete original command
*
* @param command command
* @param message message
*/
@Transactional(rollbackFor = Exception.class)
public void moveToErrorCommand(Command command, String message) {
ErrorCommand errorCommand = new ErrorCommand(command, message);
this.errorCommandMapper.insert(errorCommand);
this.commandMapper.deleteById(command.getId());
}
/**
* set process waiting thread
*
* @param command command
* @param processInstance processInstance
* @return process instance
*/
private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
processInstance.setState(ExecutionStatus.WAITING_THREAD);
if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) {
processInstance.addHistoryCmd(command.getCommandType());
}
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
createRecoveryWaitingThreadCommand(command, processInstance);
return null; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* check thread num
*
* @param command command
* @param validThreadNum validThreadNum
* @return if thread is enough
*/
private boolean checkThreadNum(Command command, int validThreadNum) {
int commandThreadCount = this.workProcessThreadNumCount(command.getProcessDefinitionCode());
return validThreadNum >= commandThreadCount;
}
/**
* insert one command
*
* @param command command
* @return create result
*/
public int createCommand(Command command) {
int result = 0;
if (command != null) {
result = commandMapper.insert(command);
}
return result;
}
/**
* find one command from queue list
*
* @return command
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public Command findOneCommand() {
return commandMapper.getOneToRun();
}
/**
* get command page
*
* @param pageSize
* @param pageNumber
* @return
*/
public List<Command> findCommandPage(int pageSize, int pageNumber) {
Page<Command> commandPage = new Page<>(pageNumber, pageSize);
return commandMapper.queryCommandPage(commandPage).getRecords();
}
/**
* check the input command exists in queue list
*
* @param command command
* @return create command result
*/
public boolean verifyIsNeedCreateCommand(Command command) {
boolean isNeedCreate = true;
EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class);
cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1);
cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1);
cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1);
CommandType commandType = command.getCommandType();
if (cmdTypeMap.containsKey(commandType)) {
ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam());
int processInstanceId = cmdParamObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<Command> commands = commandMapper.selectList(null);
for (Command tmpCommand : commands) {
if (cmdTypeMap.containsKey(tmpCommand.getCommandType())) {
ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam());
if (tempObj != null && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) {
isNeedCreate = false;
break;
}
}
}
}
return isNeedCreate;
}
/**
* find process instance detail by id
*
* @param processId processId
* @return process instance
*/
public ProcessInstance findProcessInstanceDetailById(int processId) {
return processInstanceMapper.queryDetailById(processId);
}
/**
* get task node list by definitionId
*/
public List<TaskDefinition> getTaskNodeListByDefinitionId(Integer defineId) {
ProcessDefinition processDefinition = processDefineMapper.selectById(defineId);
if (processDefinition == null) {
logger.error("process define not exists"); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return new ArrayList<>();
}
List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
return new ArrayList<>(taskDefinitionLogs);
}
/**
* find process instance by id
*
* @param processId processId
* @return process instance
*/
public ProcessInstance findProcessInstanceById(int processId) {
return processInstanceMapper.selectById(processId);
}
/**
* find process define by id.
*
* @param processDefinitionId processDefinitionId
* @return process definition
*/
public ProcessDefinition findProcessDefineById(int processDefinitionId) {
return processDefineMapper.selectById(processDefinitionId);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* find process define by code and version.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || processDefinition.getVersion() != version) {
processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version);
if (processDefinition != null) {
processDefinition.setId(0);
}
}
return processDefinition;
}
/**
* find process define by code.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/
public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) {
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* delete work process instance by id
*
* @param processInstanceId processInstanceId
* @return delete process instance result |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
public int deleteWorkProcessInstanceById(int processInstanceId) {
return processInstanceMapper.deleteById(processInstanceId);
}
/**
* delete all sub process by parent instance id
*
* @param processInstanceId processInstanceId
* @return delete all sub process instance result
*/
public int deleteAllSubWorkProcessByParentId(int processInstanceId) {
List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId);
for (Integer subId : subProcessIdList) {
deleteAllSubWorkProcessByParentId(subId);
deleteWorkProcessMapByParentId(subId);
removeTaskLogFile(subId);
deleteWorkProcessInstanceById(subId);
}
return 1;
}
/**
* remove task log file
*
* @param processInstanceId processInstanceId
*/
public void removeTaskLogFile(Integer processInstanceId) {
List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId);
if (CollectionUtils.isEmpty(taskInstanceList)) {
return;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | try (LogClientService logClient = new LogClientService()) {
for (TaskInstance taskInstance : taskInstanceList) {
String taskLogPath = taskInstance.getLogPath();
if (StringUtils.isEmpty(taskInstance.getHost())) {
continue;
}
int port = Constants.RPC_PORT;
String ip = "";
try {
ip = Host.of(taskInstance.getHost()).getIp();
} catch (Exception e) {
ip = taskInstance.getHost();
}
logClient.removeTaskLog(ip, port, taskLogPath);
}
}
}
/**
* calculate sub process number in the process define.
*
* @param processDefinitionCode processDefinitionCode
* @return process thread num count
*/
private Integer workProcessThreadNumCount(long processDefinitionCode) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
List<Integer> ids = new ArrayList<>();
recurseFindSubProcessId(processDefinition.getId(), ids);
return ids.size() + 1; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* recursive query sub process definition id by parent id.
*
* @param parentId parentId
* @param ids ids
*/
public void recurseFindSubProcessId(int parentId, List<Integer> ids) {
List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinitionId(parentId);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_ID) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionId());
recurseFindSubProcessId(subProcessParam.getProcessDefinitionId(), ids);
}
}
}
}
/**
* create recovery waiting thread command when thread pool is not enough for the process instance.
* sub work process instance need not to create recovery command.
* create recovery waiting thread command and delete origin command at the same time.
* if the recovery command is exists, only update the field update_time
*
* @param originCommand originCommand
* @param processInstance processInstance
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
if (processInstance.getIsSubProcess() == Flag.YES) {
if (originCommand != null) {
commandMapper.deleteById(originCommand.getId());
}
return;
}
Map<String, String> cmdParam = new HashMap<>();
cmdParam.put(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD, String.valueOf(processInstance.getId()));
if (originCommand == null) {
Command command = new Command(
CommandType.RECOVER_WAITING_THREAD,
processInstance.getTaskDependType(),
processInstance.getFailureStrategy(),
processInstance.getExecutorId(),
processInstance.getProcessDefinition().getCode(),
JSONUtils.toJsonString(cmdParam),
processInstance.getWarningType(),
processInstance.getWarningGroupId(),
processInstance.getScheduleTime(),
processInstance.getWorkerGroup(),
processInstance.getEnvironmentCode(),
processInstance.getProcessInstancePriority()
);
saveCommand(command);
return;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) {
originCommand.setUpdateTime(new Date());
saveCommand(originCommand);
} else {
commandMapper.deleteById(originCommand.getId());
originCommand.setId(0);
originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
originCommand.setUpdateTime(new Date());
originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam));
originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority());
saveCommand(originCommand);
}
}
/**
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map
* @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
}
return scheduleTime;
}
/**
* generate a new work process instance from command. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command,
Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam());
processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
processInstance.setWarningGroupId(warningGroupId);
Date scheduleTime = getScheduleTime(command, cmdParam); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (scheduleTime != null) {
processInstance.setScheduleTime(scheduleTime);
}
processInstance.setCommandStartTime(command.getStartTime());
processInstance.setLocations(processDefinition.getLocations());
setGlobalParamIfCommanded(processDefinition, cmdParam);
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
getCommandTypeIfComplement(processInstance, command),
processInstance.getScheduleTime()));
processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup();
processInstance.setWorkerGroup(workerGroup);
processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode());
processInstance.setTimeout(processDefinition.getTimeout());
processInstance.setTenantId(processDefinition.getTenantId());
return processInstance;
}
private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
Map<String, String> startParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) {
String startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtils.toMap(startParamJson);
}
Map<String, String> fatherParamMap = new HashMap<>(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_FATHER_PARAMS)) {
String fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtils.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
if (startParamMap.size() > 0
&& processDefinition.getGlobalParamMap() != null) {
for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) {
String val = startParamMap.get(param.getKey());
if (val != null) {
param.setValue(val);
}
}
}
}
/**
* get process tenant
* there is tenant id in definition, use the tenant of the definition.
* if there is not tenant id in the definiton or the tenant not exist
* use definition creator's tenant.
*
* @param tenantId tenantId
* @param userId userId
* @return tenant
*/
public Tenant getTenantForProcess(int tenantId, int userId) {
Tenant tenant = null;
if (tenantId >= 0) {
tenant = tenantMapper.queryById(tenantId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
if (userId == 0) {
return null;
}
if (tenant == null) {
User user = userMapper.selectById(userId);
tenant = tenantMapper.queryById(user.getTenantId());
}
return tenant;
}
/**
* get an environment
* use the code of the environment to find a environment.
*
* @param environmentCode environmentCode
* @return Environment
*/
public Environment findEnvironmentByCode(Long environmentCode) {
Environment environment = null;
if (environmentCode >= 0) {
environment = environmentMapper.queryByEnvironmentCode(environmentCode);
}
return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
|| cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
return true;
}
/**
* construct process instance according to one command.
*
* @param command command
* @param host host
* @return process instance
*/
private ProcessInstance constructProcessInstance(Command command, String host) {
ProcessInstance processInstance;
CommandType commandType = command.getCommandType();
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
ProcessDefinition processDefinition = getProcessDefinitionByCommand(command.getProcessDefinitionCode(), cmdParam);
if (processDefinition == null) {
logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode());
return null;
}
if (cmdParam != null) {
int processInstanceId = 0; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
String processId = cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING);
processInstanceId = Integer.parseInt(processId);
if (processInstanceId == 0) {
logger.error("command parameter is error, [ ProcessInstanceId ] is 0");
return null;
}
} else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
String pId = cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS);
processInstanceId = Integer.parseInt(pId);
} else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
String pId = cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD);
processInstanceId = Integer.parseInt(pId);
}
if (processInstanceId == 0) {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
} else {
processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return processInstance;
}
CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command);
if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) {
setGlobalParamIfCommanded(processDefinition, cmdParam);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
commandTypeIfComplement,
processInstance.getScheduleTime()));
processInstance.setProcessDefinition(processDefinition);
}
if (processInstance.getCommandParam() != null) {
Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam());
for (Map.Entry<String, String> entry : processCmdParam.entrySet()) {
if (!cmdParam.containsKey(entry.getKey())) {
cmdParam.put(entry.getKey(), entry.getValue());
}
}
}
if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstance.setCommandParam(command.getCommandParam());
}
} else {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
}
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
logger.error("command parameter check failed!");
return null;
}
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
processInstance.setHost(host);
ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType) {
case START_PROCESS:
break;
case START_FAILURE_TASK_PROCESS:
List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE);
List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE);
List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL);
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
failedList.addAll(killedList);
failedList.addAll(toleranceList);
for (Integer taskId : failedList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(failedList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case START_CURRENT_TASK_PROCESS:
break;
case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE);
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
ExecutionStatus.KILL);
suspendedNodeList.addAll(stopNodeList);
for (Integer taskId : suspendedNodeList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
processInstance.setRecovery(Flag.YES);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA:
List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : taskInstanceList) {
taskInstance.setFlag(Flag.NO);
this.updateTaskInstance(taskInstance);
}
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case REPEAT_RUNNING:
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
}
List<TaskInstance> validTaskList = findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : validTaskList) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
}
processInstance.setStartTime(new Date());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
default:
break;
}
processInstance.setState(runStatus);
return processInstance;
}
/**
* get process definition by command
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance
* Otherwise, get the latest version of ProcessDefinition
*
* @return ProcessDefinition
*/
private ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode, Map<String, String> cmdParam) {
if (cmdParam != null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | int processInstanceId = 0;
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD));
}
if (processInstanceId != 0) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return null;
}
return processDefineLogMapper.queryByDefinitionCodeAndVersion(
processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
}
}
return processDefineMapper.queryByCode(processDefinitionCode);
}
/**
* return complement data if the process start with complement data
*
* @param processInstance processInstance
* @param command command
* @return command type
*/
private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) {
if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) {
return CommandType.COMPLEMENT_DATA;
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return command.getCommandType();
}
}
/**
* initialize complement data parameters
*
* @param processDefinition processDefinition
* @param processInstance processInstance
* @param cmdParam cmdParam
*/
private void initComplementDataParam(ProcessDefinition processDefinition,
ProcessInstance processInstance,
Map<String, String> cmdParam) {
if (!processInstance.isComplementData()) {
return;
}
Date startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE),
YYYY_MM_DD_HH_MM_SS);
if (Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(startComplementTime);
}
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
}
/**
* set sub work process parameters.
* handle sub work process instance, update relation table and command parameters
* set sub work process flag, extends parent work process command parameters |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param subProcessInstance subProcessInstance
*/
public void setSubProcessParam(ProcessInstance subProcessInstance) {
String cmdParam = subProcessInstance.getCommandParam();
if (StringUtils.isEmpty(cmdParam)) {
return;
}
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
paramMap.remove(CMD_PARAM_SUB_PROCESS);
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
subProcessInstance.setIsSubProcess(Flag.YES);
this.saveProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (StringUtils.isNotEmpty(parentInstanceId)) {
ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
this.saveProcessInstance(subProcessInstance);
} else {
logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class);
if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) {
return;
}
processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
this.updateWorkProcessInstanceMap(processInstanceMap);
}
/**
* join parent global params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentGlobalParams parentGlobalParams
* @param subGlobalParams subGlobalParams
* @return global params join
*/
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class);
List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class);
Map<String, String> subMap = subPropertyList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
for (Property parent : parentPropertyList) {
if (!subMap.containsKey(parent.getProp())) {
subPropertyList.add(parent);
}
}
return JSONUtils.toJsonString(subPropertyList);
}
/**
* initialize task instance
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param taskInstance taskInstance
*/
private void initTaskInstance(TaskInstance taskInstance) {
if (!taskInstance.isSubProcess()
&& (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
return;
}
taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
updateTaskInstance(taskInstance);
}
/**
* retry submit task to db
*
* @param taskInstance
* @param commitRetryTimes
* @param commitInterval
* @return
*/
public TaskInstance submitTask(TaskInstance taskInstance, int commitRetryTimes, int commitInterval) {
int retryTimes = 1;
boolean submitDB = false;
TaskInstance task = null;
while (retryTimes <= commitRetryTimes) {
try {
if (!submitDB) {
task = submitTask(taskInstance);
if (task != null && task.getId() != 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | submitDB = true;
break;
}
}
if (!submitDB) {
logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes);
}
Thread.sleep(commitInterval);
} catch (Exception e) {
logger.error("task commit to mysql failed", e);
}
retryTimes += 1;
}
return task;
}
/**
* submit task to db
* submit sub process to command
*
* @param taskInstance taskInstance
* @return task instance
*/
@Transactional(rollbackFor = Exception.class)
public TaskInstance submitTask(TaskInstance taskInstance) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
logger.info("start submit task : {}, instance id:{}, state: {}",
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
if (task == null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
return task;
}
if (!task.getState().typeIsFinished()) {
createSubWorkProcess(processInstance, task);
}
logger.info("end submit task to db successfully:{} {} state:{} complete, instance id:{} state: {} ",
taskInstance.getId(), taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
return task;
}
/**
* set work process instance map
* consider o
* repeat running does not generate new sub process instance
* set map {parent instance id, task instance id, 0(child instance id)}
*
* @param parentInstance parentInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) {
ProcessInstanceMap processMap = findWorkProcessMapByParent(parentInstance.getId(), parentTask.getId());
if (processMap != null) {
return processMap;
}
if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
processMap = findPreviousTaskProcessMap(parentInstance, parentTask);
if (processMap != null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processMap.setParentTaskInstanceId(parentTask.getId());
updateWorkProcessInstanceMap(processMap);
return processMap;
}
}
processMap = new ProcessInstanceMap();
processMap.setParentProcessInstanceId(parentInstance.getId());
processMap.setParentTaskInstanceId(parentTask.getId());
createWorkProcessInstanceMap(processMap);
return processMap;
}
/**
* find previous task work process map.
*
* @param parentProcessInstance parentProcessInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
TaskInstance parentTask) {
Integer preTaskId = 0;
List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId());
for (TaskInstance task : preTaskList) {
if (task.getName().equals(parentTask.getName())) {
preTaskId = task.getId();
ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId);
if (map != null) {
return map;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
}
logger.info("sub process instance is not found,parent task:{},parent instance:{}",
parentTask.getId(), parentProcessInstance.getId());
return null;
}
/**
* create sub work process command
*
* @param parentProcessInstance parentProcessInstance
* @param task task
*/
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) {
if (!task.isSubProcess()) {
return;
}
ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId());
if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) {
return;
}
instanceMap = setProcessInstanceMap(parentProcessInstance, task);
ProcessInstance childInstance = null;
if (instanceMap.getProcessInstanceId() != 0) {
childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId());
}
Command subProcessCommand = createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task);
updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode());
initSubInstanceState(childInstance); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | createCommand(subProcessCommand);
logger.info("sub process command created: {} ", subProcessCommand);
}
/**
* complement data needs transform parent parameter to child.
*/
private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map<String, String> fatherParams) {
String processMapStr = JSONUtils.toJsonString(instanceMap);
Map<String, String> cmdParam = JSONUtils.toMap(processMapStr);
if (parentProcessInstance.isComplementData()) {
Map<String, String> parentParam = JSONUtils.toMap(parentProcessInstance.getCommandParam());
String endTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE);
String startTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endTime);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime);
processMapStr = JSONUtils.toJsonString(cmdParam);
}
if (fatherParams.size() != 0) {
cmdParam.put(CMD_PARAM_FATHER_PARAMS, JSONUtils.toJsonString(fatherParams));
processMapStr = JSONUtils.toJsonString(cmdParam);
}
return processMapStr;
}
public Map<String, String> getGlobalParamMap(String globalParams) {
List<Property> propList;
Map<String, String> globalParamMap = new HashMap<>();
if (StringUtils.isNotEmpty(globalParams)) {
propList = JSONUtils.toList(globalParams, Property.class);
globalParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
return globalParamMap;
}
/**
* create sub work process command
*/
public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
ProcessInstance childInstance,
ProcessInstanceMap instanceMap,
TaskInstance task) {
CommandType commandType = getSubCommandType(parentProcessInstance, childInstance);
Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams());
int childDefineId = Integer.parseInt(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_ID));
ProcessDefinition processDefinition = processDefineMapper.queryByDefineId(childDefineId);
Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS);
List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
Map<String, String> globalMap = this.getGlobalParamMap(parentProcessInstance.getGlobalParams());
Map<String, String> fatherParams = new HashMap<>();
if (CollectionUtils.isNotEmpty(allParam)) {
for (Property info : allParam) {
fatherParams.put(info.getProp(), globalMap.get(info.getProp()));
}
}
String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams);
return new Command(
commandType,
TaskDependType.TASK_POST,
parentProcessInstance.getFailureStrategy(),
parentProcessInstance.getExecutorId(),
processDefinition.getCode(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processParam,
parentProcessInstance.getWarningType(),
parentProcessInstance.getWarningGroupId(),
parentProcessInstance.getScheduleTime(),
task.getWorkerGroup(),
task.getEnvironmentCode(),
parentProcessInstance.getProcessInstancePriority()
);
}
/**
* initialize sub work flow state
* child instance state would be initialized when 'recovery from pause/stop/failure'
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
childInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
updateProcessInstance(childInstance);
}
}
/**
* get sub work flow command type
* child instance exist: child command = fatherCommand
* child instance not exists: child command = fatherCommand[0]
*/
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
CommandType commandType = parentProcessInstance.getCommandType();
if (childInstance == null) {
String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return commandType;
}
/**
* update sub process definition
*
* @param parentProcessInstance parentProcessInstance
* @param childDefinitionCode childDefinitionId
*/
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) {
ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(),
parentProcessInstance.getProcessDefinitionVersion());
ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode);
if (childDefinition != null && fatherDefinition != null) {
childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId());
processDefineMapper.updateById(childDefinition);
}
}
/**
* submit task to mysql
*
* @param taskInstance taskInstance
* @param processInstance processInstance
* @return task instance
*/
public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) {
ExecutionStatus processInstanceState = processInstance.getState();
if (taskInstance.getState().typeIsFailure()) {
if (taskInstance.isSubProcess()) {
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (processInstanceState != ExecutionStatus.READY_STOP
&& processInstanceState != ExecutionStatus.READY_PAUSE) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE) {
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
}
taskInstance.setSubmitTime(null);
taskInstance.setStartTime(null);
taskInstance.setEndTime(null);
taskInstance.setFlag(Flag.YES);
taskInstance.setHost(null);
taskInstance.setId(0);
}
}
}
taskInstance.setExecutorId(processInstance.getExecutorId());
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority());
taskInstance.setState(getSubmitTaskState(taskInstance, processInstanceState));
if (taskInstance.getSubmitTime() == null) {
taskInstance.setSubmitTime(new Date());
}
if (taskInstance.getFirstSubmitTime() == null) {
taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime());
}
boolean saveResult = saveTaskInstance(taskInstance);
if (!saveResult) {
return null; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
return taskInstance;
}
/**
* get submit task instance state by the work process state
* cannot modify the task state when running/kill/submit success, or this
* task instance is already exists in task queue .
* return pause if work process state is ready pause
* return stop if work process state is ready stop
* if all of above are not satisfied, return submit success
*
* @param taskInstance taskInstance
* @param processInstanceState processInstanceState
* @return process instance state
*/
public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ExecutionStatus processInstanceState) {
ExecutionStatus state = taskInstance.getState();
if (
state == ExecutionStatus.RUNNING_EXECUTION
|| state == ExecutionStatus.DELAY_EXECUTION
|| state == ExecutionStatus.KILL
) {
return state;
}
if (processInstanceState == ExecutionStatus.READY_PAUSE) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | state = ExecutionStatus.PAUSE;
} else if (processInstanceState == ExecutionStatus.READY_STOP
|| !checkProcessStrategy(taskInstance)) {
state = ExecutionStatus.KILL;
} else {
state = ExecutionStatus.SUBMITTED_SUCCESS;
}
return state;
}
/**
* check process instance strategy
*
* @param taskInstance taskInstance
* @return check strategy result
*/
private boolean checkProcessStrategy(TaskInstance taskInstance) {
ProcessInstance processInstance = this.findProcessInstanceById(taskInstance.getProcessInstanceId());
FailureStrategy failureStrategy = processInstance.getFailureStrategy();
if (failureStrategy == FailureStrategy.CONTINUE) {
return true;
}
List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());
for (TaskInstance task : taskInstances) {
if (task.getState() == ExecutionStatus.FAILURE
&& task.getRetryTimes() >= task.getMaxRetryTimes()) {
return false;
}
}
return true;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,347 | [Bug] [Master] the first schedule_time is error in complement 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
schedule_time is set error:
command_param: {"complementEndDate":"2021-09-21 00:26:00","complementStartDate":"2021-09-21 00:24:00"}
schedule_time: 2021-09-21 00:24:00
cron: 0 * * * * ? *
### What you expected to happen
the schedule_time is set OK.
schedule_time: 2021-09-21 00:25:00
### How to reproduce
complement data cron : 0 * * * * ? *
complement data some date, you would find some errors in schedule_time.
### Anything else
_No response_
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6347 | https://github.com/apache/dolphinscheduler/pull/6351 | b71f6aea7af899da41bd958caa30d68d89a9aec4 | 20a3741b249b871ffdf975de111244e6c68f3f07 | "2021-09-25T08:58:23Z" | java | "2021-09-26T03:55:57Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* insert or update work process instance to data base
*
* @param processInstance processInstance
*/
public void saveProcessInstance(ProcessInstance processInstance) {
if (processInstance == null) {
logger.error("save error, process instance is null!");
return;
}
if (processInstance.getId() != 0) {
processInstanceMapper.updateById(processInstance);
} else {
processInstanceMapper.insert(processInstance);
}
}
/**
* insert or update command
*
* @param command command
* @return save command result
*/
public int saveCommand(Command command) {
if (command.getId() != 0) {
return commandMapper.updateById(command);
} else {
return commandMapper.insert(command);
}
}
/** |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.