You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2022/07/29 15:49:55 UTC
[dolphinscheduler] branch dev updated: [BUG-11181] [Document] text check (#11183)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new d73ad2e7d5 [BUG-11181] [Document] text check (#11183)
d73ad2e7d5 is described below
commit d73ad2e7d5fb3253a34c1169cd149fa811ec73d7
Author: fuchanghai <33...@users.noreply.github.com>
AuthorDate: Fri Jul 29 23:49:46 2022 +0800
[BUG-11181] [Document] text check (#11183)
---
docs/docs/zh/development/architecture-design.md | 3 +--
.../api/service/impl/ExecutorServiceImpl.java | 11 +++++------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/docs/docs/zh/development/architecture-design.md b/docs/docs/zh/development/architecture-design.md
index 13d0563cf0..35bee1a1da 100644
--- a/docs/docs/zh/development/architecture-design.md
+++ b/docs/docs/zh/development/architecture-design.md
@@ -206,7 +206,7 @@ Master Scheduler线程一旦发现任务实例为” 需要容错”状态,则
- 一种是业务节点,这种节点都对应一个实际的脚本或者处理语句,比如Shell节点,MR节点、Spark节点、依赖节点等。
-- 还有一种是逻辑节点,这种节点不做实际的脚本或语句处理,只是整个流程流转的逻辑处理,比如子流程节等。
+- 还有一种是逻辑节点,这种节点不做实际的脚本或语句处理,只是整个流程流转的逻辑处理,比如子流程节点等。
每一个**业务节点**都可以配置失败重试的次数,当该任务节点失败,会自动重试,直到成功或者超过配置的重试次数。**逻辑节点**不支持失败重试。但是逻辑节点里的任务支持重试。
@@ -299,4 +299,3 @@ public class TaskLogFilter extends Filter<ILoggingEvent> {
### 总结
本文从调度出发,初步介绍了大数据分布式工作流调度系统--DolphinScheduler的架构原理及实现思路。未完待续
-
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
index 63ebc69536..473acf3f39 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
@@ -294,7 +294,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
}
/**
- * check if the current process has subprocesses and all subprocesses are valid
+ * check whether the current process has subprocesses and validate all subprocesses
*
* @param processDefinition
* @return check result
@@ -562,7 +562,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
}
/**
- * insert command, used in the implementation of the page, re run, recovery (pause / failure) execution
+ * insert command, used in the implementation of the page, rerun, recovery (pause / failure) execution
*
* @param loginUser login user
* @param instanceId instance id
@@ -607,7 +607,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
}
/**
- * check if sub processes are offline before starting process definition
+ * check whether sub processes are offline before starting process definition
*
* @param processDefinitionCode process definition code
* @return check result code
@@ -724,8 +724,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
return createComplementCommandList(schedule, runMode, command, expectedParallelismNumber,
complementDependentMode);
} catch (CronParseException cronParseException) {
- // this just make compile happy, since we already validate the cron before
- logger.error("Parse cron error", cronParseException);
+ // We catch the exception here just to make compiler happy, since we have already validated the schedule cron expression before
return 0;
}
} else {
@@ -940,7 +939,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
/**
* @param schedule
- * @return check error return 0 otherwish 1
+ * @return check error return 0, otherwise 1
*/
private boolean isValidateScheduleTime(String schedule) {
Map<String, String> scheduleResult = JSONUtils.toMap(schedule);