diff --git a/docker/docker-swarm/config.env.sh b/docker/docker-swarm/config.env.sh index 4127102e35..3b368f4102 100755 --- a/docker/docker-swarm/config.env.sh +++ b/docker/docker-swarm/config.env.sh @@ -92,6 +92,9 @@ MASTER_TASK_COMMIT_RETRYTIMES=5 MASTER_TASK_COMMIT_INTERVAL=1000 MASTER_MAX_CPULOAD_AVG=-1 MASTER_RESERVED_MEMORY=0.3 +MASTER_FAILOVER_INTERVAL=10 +MASTER_KILL_YARN_JOB_WHEN_HANDLE_FAILOVER=true +MASTER_PERSIST_EVENT_STATE_THREADS=10 #============================================================================ # Worker Server @@ -103,6 +106,7 @@ WORKER_HOST_WEIGHT=100 WORKER_MAX_CPULOAD_AVG=-1 WORKER_RESERVED_MEMORY=0.3 WORKER_GROUPS=default +WORKER_RETRY_REPORT_TASK_STATUES_INTERVAL=10 ALERT_LISTEN_HOST=dolphinscheduler-alert #============================================================================ diff --git a/docker/kubernetes/dolphinscheduler/values.yaml b/docker/kubernetes/dolphinscheduler/values.yaml index dd70646ae5..4b0ebdc75c 100644 --- a/docker/kubernetes/dolphinscheduler/values.yaml +++ b/docker/kubernetes/dolphinscheduler/values.yaml @@ -166,6 +166,7 @@ master: MASTER_TASK_COMMIT_INTERVAL: "1000" MASTER_MAX_CPULOAD_AVG: "-1" MASTER_RESERVED_MEMORY: "0.3" + MASTER_FAILOVER_INTERVAL: 10 MASTER_KILL_YARN_JOB_WHEN_HANDLE_FAILOVER: "true" ORG_QUARTZ_THREADPOOL_THREADCOUNT: "25" ORG_QUARTZ_SCHEDULER_BATCHTRIGGERACQUISTITIONMAXCOUNT: "1" diff --git a/dolphinscheduler-server/src/main/resources/master.properties b/dolphinscheduler-server/src/main/resources/master.properties index 1ebe9c68d2..e67d6973bb 100644 --- a/dolphinscheduler-server/src/main/resources/master.properties +++ b/dolphinscheduler-server/src/main/resources/master.properties @@ -36,11 +36,17 @@ # master commit task interval, the unit is millisecond #master.task.commit.interval=1000 -# master cache process definition, default: true -#master.cache.process.definition=true - # master max cpuload avg, only higher than the system cpu load average, master server can schedule. default value -1: the number of cpu cores * 2 #master.max.cpuload.avg=-1 # master reserved memory, only lower than system available memory, master server can schedule. default value 0.3, the unit is G #master.reserved.memory=0.3 + +# master failover interval, default value 10 seconds +#master.failover.interval=10 + +# master kill yarn job when failover, default: true +#master.kill.yarn.job.when.handle.failover=true + +# master persist event state threads, default value 10 +#master.persist.event.state.threads=10 diff --git a/dolphinscheduler-server/src/main/resources/worker.properties b/dolphinscheduler-server/src/main/resources/worker.properties index 0e72baac8b..9be218b21e 100644 --- a/dolphinscheduler-server/src/main/resources/worker.properties +++ b/dolphinscheduler-server/src/main/resources/worker.properties @@ -49,3 +49,6 @@ task.plugin.dir=lib/plugin/task #task.plugin.binding config the task plugin need be load when development and run in IDE #task.plugin.binding=./dolphinscheduler-task-plugin/dolphinscheduler-task-shell/pom.xml + +# worker retry report task statues interval, default value 10 +#worker.retry.report.task.statues.interval=10