You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/08/20 13:36:52 UTC
[dolphinscheduler] branch 1.3.8-prepare updated:
[1.3.8-prepare][FIX-6000]log buffer size no need to specify the size
(#6005)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch 1.3.8-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/1.3.8-prepare by this push:
new 40db187 [1.3.8-prepare][FIX-6000]log buffer size no need to specify the size (#6005)
40db187 is described below
commit 40db1877e3565f0d6b11e5b5403ced2b02a8559c
Author: Kirs <ac...@163.com>
AuthorDate: Fri Aug 20 21:36:46 2021 +0800
[1.3.8-prepare][FIX-6000]log buffer size no need to specify the size (#6005)
* [1.3.8-prepare][FIX-6000]log buffer size no need to specify the size
* upgrade version
* upgrade sql script version
---
.../DOLPHIN/{1.3.7 => 1.3.8}/alerts.json | 6 ++--
.../configuration/dolphin-alert.xml | 0
.../configuration/dolphin-application-api.xml | 0
.../configuration/dolphin-common.xml | 0
.../configuration/dolphin-datasource.xml | 0
.../{1.3.7 => 1.3.8}/configuration/dolphin-env.xml | 0
.../configuration/dolphin-master.xml | 0
.../configuration/dolphin-quartz.xml | 0
.../configuration/dolphin-worker.xml | 0
.../configuration/dolphin-zookeeper.xml | 0
.../DOLPHIN/{1.3.7 => 1.3.8}/metainfo.xml | 2 +-
.../alerts/alert_dolphin_scheduler_status.py | 0
.../package/scripts/dolphin_alert_service.py | 0
.../package/scripts/dolphin_api_service.py | 0
.../package/scripts/dolphin_env.py | 0
.../package/scripts/dolphin_logger_service.py | 0
.../package/scripts/dolphin_master_service.py | 0
.../package/scripts/dolphin_worker_service.py | 0
.../{1.3.7 => 1.3.8}/package/scripts/params.py | 0
.../package/scripts/service_check.py | 0
.../package/scripts/status_params.py | 0
.../package/templates/alert.properties.j2 | 0
.../templates/application-api.properties.j2 | 0
.../package/templates/common.properties.j2 | 0
.../package/templates/datasource.properties.j2 | 0
.../package/templates/dolphin-daemon.sh.j2 | 0
.../package/templates/master.properties.j2 | 0
.../package/templates/quartz.properties.j2 | 0
.../package/templates/worker.properties.j2 | 0
.../package/templates/zookeeper.properties.j2 | 0
.../{1.3.7 => 1.3.8}/quicklinks/quicklinks.json | 0
.../DOLPHIN/{1.3.7 => 1.3.8}/themes/theme.json | 0
ambari_plugin/statcks/DOLPHIN/metainfo.xml | 2 +-
docker/docker-swarm/docker-compose.yml | 8 +++---
docker/docker-swarm/docker-stack.yml | 8 +++---
docker/kubernetes/dolphinscheduler/Chart.yaml | 2 +-
docker/kubernetes/dolphinscheduler/values.yaml | 2 +-
.../apache/dolphinscheduler/common/Constants.java | 6 ----
.../worker/task/AbstractCommandExecutor.java | 32 +++++++++++++++-------
sql/dolphinscheduler_mysql.sql | 2 +-
sql/dolphinscheduler_postgre.sql | 2 +-
sql/soft_version | 2 +-
42 files changed, 40 insertions(+), 34 deletions(-)
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/alerts.json b/ambari_plugin/common-services/DOLPHIN/1.3.8/alerts.json
similarity index 95%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/alerts.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/alerts.json
index 9bec595..8483d58 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.7/alerts.json
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.8/alerts.json
@@ -65,7 +65,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.7/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.8/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
@@ -98,7 +98,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.7/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.8/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
@@ -131,7 +131,7 @@
"enabled": true,
"source": {
"type": "SCRIPT",
- "path": "DOLPHIN/1.3.7/package/alerts/alert_dolphin_scheduler_status.py",
+ "path": "DOLPHIN/1.3.8/package/alerts/alert_dolphin_scheduler_status.py",
"parameters": [
{
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-alert.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-alert.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-alert.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-alert.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-application-api.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-application-api.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-application-api.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-application-api.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-common.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-common.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-common.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-common.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-datasource.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-datasource.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-datasource.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-datasource.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-env.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-env.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-env.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-env.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-master.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-master.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-master.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-master.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-quartz.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-quartz.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-quartz.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-quartz.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-worker.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-worker.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-worker.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-worker.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-zookeeper.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-zookeeper.xml
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/configuration/dolphin-zookeeper.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/configuration/dolphin-zookeeper.xml
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/metainfo.xml b/ambari_plugin/common-services/DOLPHIN/1.3.8/metainfo.xml
similarity index 99%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/metainfo.xml
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/metainfo.xml
index 51c8eae..8c2cc62 100644
--- a/ambari_plugin/common-services/DOLPHIN/1.3.7/metainfo.xml
+++ b/ambari_plugin/common-services/DOLPHIN/1.3.8/metainfo.xml
@@ -20,7 +20,7 @@
<name>DOLPHIN</name>
<displayName>Dolphin Scheduler</displayName>
<comment>分布式易扩展的可视化DAG工作流任务调度系统</comment>
- <version>1.3.7</version>
+ <version>1.3.8</version>
<components>
<component>
<name>DOLPHIN_MASTER</name>
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/alerts/alert_dolphin_scheduler_status.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/alerts/alert_dolphin_scheduler_status.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/alerts/alert_dolphin_scheduler_status.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/alerts/alert_dolphin_scheduler_status.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_alert_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_alert_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_alert_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_alert_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_api_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_api_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_api_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_api_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_env.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_env.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_env.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_env.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_logger_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_logger_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_logger_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_logger_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_master_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_master_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_master_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_master_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_worker_service.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_worker_service.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/dolphin_worker_service.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/dolphin_worker_service.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/params.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/params.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/params.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/params.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/service_check.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/service_check.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/service_check.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/service_check.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/status_params.py b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/status_params.py
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/scripts/status_params.py
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/scripts/status_params.py
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/alert.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/alert.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/alert.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/alert.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/application-api.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/application-api.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/application-api.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/application-api.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/common.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/common.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/common.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/common.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/datasource.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/datasource.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/datasource.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/datasource.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/dolphin-daemon.sh.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/dolphin-daemon.sh.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/dolphin-daemon.sh.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/dolphin-daemon.sh.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/master.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/master.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/master.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/master.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/quartz.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/quartz.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/quartz.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/quartz.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/worker.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/worker.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/worker.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/worker.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/zookeeper.properties.j2 b/ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/zookeeper.properties.j2
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/package/templates/zookeeper.properties.j2
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/package/templates/zookeeper.properties.j2
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/quicklinks/quicklinks.json b/ambari_plugin/common-services/DOLPHIN/1.3.8/quicklinks/quicklinks.json
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/quicklinks/quicklinks.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/quicklinks/quicklinks.json
diff --git a/ambari_plugin/common-services/DOLPHIN/1.3.7/themes/theme.json b/ambari_plugin/common-services/DOLPHIN/1.3.8/themes/theme.json
similarity index 100%
rename from ambari_plugin/common-services/DOLPHIN/1.3.7/themes/theme.json
rename to ambari_plugin/common-services/DOLPHIN/1.3.8/themes/theme.json
diff --git a/ambari_plugin/statcks/DOLPHIN/metainfo.xml b/ambari_plugin/statcks/DOLPHIN/metainfo.xml
index b236e1d..9087ab7 100755
--- a/ambari_plugin/statcks/DOLPHIN/metainfo.xml
+++ b/ambari_plugin/statcks/DOLPHIN/metainfo.xml
@@ -20,7 +20,7 @@
<services>
<service>
<name>DOLPHIN</name>
- <extends>common-services/DOLPHIN/1.3.7</extends>
+ <extends>common-services/DOLPHIN/1.3.8</extends>
</service>
</services>
</metainfo>
\ No newline at end of file
diff --git a/docker/docker-swarm/docker-compose.yml b/docker/docker-swarm/docker-compose.yml
index 0ebe3eb..f958d17 100644
--- a/docker/docker-swarm/docker-compose.yml
+++ b/docker/docker-swarm/docker-compose.yml
@@ -44,7 +44,7 @@ services:
- dolphinscheduler
dolphinscheduler-api:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: api-server
ports:
- 12345:12345
@@ -68,7 +68,7 @@ services:
- dolphinscheduler
dolphinscheduler-alert:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: alert-server
environment:
TZ: Asia/Shanghai
@@ -87,7 +87,7 @@ services:
- dolphinscheduler
dolphinscheduler-master:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: master-server
environment:
TZ: Asia/Shanghai
@@ -108,7 +108,7 @@ services:
- dolphinscheduler
dolphinscheduler-worker:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: worker-server
environment:
TZ: Asia/Shanghai
diff --git a/docker/docker-swarm/docker-stack.yml b/docker/docker-swarm/docker-stack.yml
index b49f8b8..49397a3 100644
--- a/docker/docker-swarm/docker-stack.yml
+++ b/docker/docker-swarm/docker-stack.yml
@@ -48,7 +48,7 @@ services:
replicas: 1
dolphinscheduler-api:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: api-server
ports:
- 12345:12345
@@ -71,7 +71,7 @@ services:
replicas: 1
dolphinscheduler-alert:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: alert-server
environment:
TZ: Asia/Shanghai
@@ -90,7 +90,7 @@ services:
replicas: 1
dolphinscheduler-master:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: master-server
environment:
TZ: Asia/Shanghai
@@ -110,7 +110,7 @@ services:
replicas: 1
dolphinscheduler-worker:
- image: apache/dolphinscheduler:1.3.7
+ image: apache/dolphinscheduler:1.3.8
command: worker-server
environment:
TZ: Asia/Shanghai
diff --git a/docker/kubernetes/dolphinscheduler/Chart.yaml b/docker/kubernetes/dolphinscheduler/Chart.yaml
index d021c2b..65bf194 100644
--- a/docker/kubernetes/dolphinscheduler/Chart.yaml
+++ b/docker/kubernetes/dolphinscheduler/Chart.yaml
@@ -39,7 +39,7 @@ version: 1.3.0
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application.
-appVersion: 1.3.7
+appVersion: 1.3.8
dependencies:
- name: postgresql
diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml
index 4c791d3..6b482a7 100644
--- a/docker/kubernetes/dolphinscheduler/values.yaml
+++ b/docker/kubernetes/dolphinscheduler/values.yaml
@@ -23,7 +23,7 @@ timezone: "Asia/Shanghai"
image:
repository: "apache/dolphinscheduler"
- tag: "1.3.7"
+ tag: "1.3.8"
pullPolicy: "IfNotPresent"
pullSecret: ""
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index f56b409..c3e48c7 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@ -389,12 +389,6 @@ public final class Constants {
public static final int DEFAULT_LOG_FLUSH_INTERVAL = 1000;
/**
- * default log buffer size in AbstractCommandExecutor
- */
- public static final int DEFAULT_LOG_BUFFER_SIZE = 128;
-
-
- /**
* time unit secong to minutes
*/
public static final int SEC_2_MINUTES_TIME_UNIT = 60;
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
index a5a1925..7a3180e 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java
@@ -18,6 +18,7 @@ package org.apache.dolphinscheduler.server.worker.task;
import com.sun.jna.platform.win32.Kernel32;
import com.sun.jna.platform.win32.WinNT;
+
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.thread.Stopper;
@@ -31,6 +32,7 @@ import org.apache.dolphinscheduler.server.utils.ProcessUtils;
import org.apache.dolphinscheduler.server.worker.cache.TaskExecutionContextCacheManager;
import org.apache.dolphinscheduler.server.worker.cache.impl.TaskExecutionContextCacheManagerImpl;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
+
import org.slf4j.Logger;
import java.io.*;
@@ -61,17 +63,17 @@ public abstract class AbstractCommandExecutor {
protected static final Pattern APPLICATION_REGEX = Pattern.compile(Constants.APPLICATION_REGEX);
/**
- * process
+ * process
*/
private Process process;
/**
- * log handler
+ * log handler
*/
protected Consumer<LinkedBlockingQueue<String>> logHandler;
/**
- * logger
+ * logger
*/
protected Logger logger;
@@ -99,7 +101,7 @@ public abstract class AbstractCommandExecutor {
this.logHandler = logHandler;
this.taskExecutionContext = taskExecutionContext;
this.logger = logger;
- this.logBuffer = new LinkedBlockingQueue<>(Constants.DEFAULT_LOG_BUFFER_SIZE);
+ this.logBuffer = new LinkedBlockingQueue<>();
this.taskExecutionContextCacheManager = SpringApplicationContext.getBean(TaskExecutionContextCacheManagerImpl.class);
}
@@ -224,7 +226,7 @@ public abstract class AbstractCommandExecutor {
result.setExitStatusCode(process.exitValue());
// if yarn task , yarn state is final state
- if (process.exitValue() == 0){
+ if (process.exitValue() == 0) {
result.setExitStatusCode(isSuccessOfYarnState(appIds) ? EXIT_CODE_SUCCESS : EXIT_CODE_FAILURE);
}
} else {
@@ -234,7 +236,7 @@ public abstract class AbstractCommandExecutor {
}
logger.info("process has exited, execute path:{}, processId:{} ,exitStatusCode:{} ,processWaitForStatus:{} ,processExitValue:{}",
- taskExecutionContext.getExecutePath(), processId, result.getExitStatusCode(), status, process.exitValue());
+ taskExecutionContext.getExecutePath(), processId, result.getExitStatusCode(), status, process.exitValue());
return result;
}
@@ -242,6 +244,7 @@ public abstract class AbstractCommandExecutor {
/**
* cancel application
+ *
* @throws Exception exception
*/
public void cancelApplication() throws Exception {
@@ -272,6 +275,7 @@ public abstract class AbstractCommandExecutor {
/**
* soft kill
+ *
* @param processId process id
* @return process is killed
* @throws InterruptedException interrupted exception
@@ -296,6 +300,7 @@ public abstract class AbstractCommandExecutor {
/**
* hard kill
+ *
* @param processId process id
*/
private void hardKill(int processId) {
@@ -314,6 +319,7 @@ public abstract class AbstractCommandExecutor {
/**
* print command
+ *
* @param commands process builder
*/
private void printCommand(List<String> commands) {
@@ -344,6 +350,7 @@ public abstract class AbstractCommandExecutor {
/**
* get the standard output of the process
+ *
* @param process process
*/
private void parseProcessOutput(Process process) {
@@ -393,7 +400,7 @@ public abstract class AbstractCommandExecutor {
try {
for (String appId : appIds) {
logger.info("check yarn application status, appId:{}", appId);
- while(Stopper.isRunning()){
+ while (Stopper.isRunning()) {
ExecutionStatus applicationStatus = HadoopUtils.getInstance().getApplicationStatus(appId);
logger.debug("check yarn application status, appId:{}, final state:{}", appId, applicationStatus.name());
if (applicationStatus.equals(ExecutionStatus.FAILURE) ||
@@ -401,7 +408,7 @@ public abstract class AbstractCommandExecutor {
return false;
}
- if (applicationStatus.equals(ExecutionStatus.SUCCESS)){
+ if (applicationStatus.equals(ExecutionStatus.SUCCESS)) {
break;
}
Thread.sleep(Constants.SLEEP_TIME_MILLIS);
@@ -444,6 +451,7 @@ public abstract class AbstractCommandExecutor {
/**
* convert file to list
+ *
* @param filename file name
* @return line list
*/
@@ -451,7 +459,7 @@ public abstract class AbstractCommandExecutor {
List<String> lineList = new ArrayList<>(100);
File file = new File(filename);
- if (!file.exists()){
+ if (!file.exists()) {
return lineList;
}
@@ -468,6 +476,7 @@ public abstract class AbstractCommandExecutor {
/**
* find app id
+ *
* @param line line
* @return appid
*/
@@ -525,7 +534,7 @@ public abstract class AbstractCommandExecutor {
/**
* when log buffer siz or flush time reach condition , then flush
*
- * @param lastFlushTime last flush time
+ * @param lastFlushTime last flush time
* @return last flush time
*/
private long flush(long lastFlushTime) {
@@ -545,7 +554,10 @@ public abstract class AbstractCommandExecutor {
protected List<String> commandOptions() {
return Collections.emptyList();
}
+
protected abstract String buildCommandFilePath();
+
protected abstract String commandInterpreter();
+
protected abstract void createCommandFileIfNotExists(String execCommand, String commandFile) throws IOException;
}
\ No newline at end of file
diff --git a/sql/dolphinscheduler_mysql.sql b/sql/dolphinscheduler_mysql.sql
index 55b6c91..999465d 100644
--- a/sql/dolphinscheduler_mysql.sql
+++ b/sql/dolphinscheduler_mysql.sql
@@ -816,7 +816,7 @@ CREATE TABLE `t_ds_version` (
-- ----------------------------
-- Records of t_ds_version
-- ----------------------------
-INSERT INTO `t_ds_version` VALUES ('1', '1.3.7');
+INSERT INTO `t_ds_version` VALUES ('1', '1.3.8');
-- ----------------------------
diff --git a/sql/dolphinscheduler_postgre.sql b/sql/dolphinscheduler_postgre.sql
index 7631fee..0fad850 100644
--- a/sql/dolphinscheduler_postgre.sql
+++ b/sql/dolphinscheduler_postgre.sql
@@ -763,4 +763,4 @@ INSERT INTO t_ds_relation_user_alertgroup(alertgroup_id,user_id,create_time,upda
INSERT INTO t_ds_queue(queue_name,queue,create_time,update_time) VALUES ('default', 'default','2018-11-29 10:22:33', '2018-11-29 10:22:33');
-- Records of t_ds_queue,default queue name : default
-INSERT INTO t_ds_version(version) VALUES ('1.3.7');
\ No newline at end of file
+INSERT INTO t_ds_version(version) VALUES ('1.3.8');
\ No newline at end of file
diff --git a/sql/soft_version b/sql/soft_version
index 8ed486a..06c7347 100644
--- a/sql/soft_version
+++ b/sql/soft_version
@@ -1 +1 @@
-1.3.7
\ No newline at end of file
+1.3.8
\ No newline at end of file