This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from d6fcf60534 [Improvement-13751][Worker] Support real-time pod log
collection (#13752)
add 41a8ba9aab Support alert server HA (#13865)
No new revisions were added by this update.
Summary of changes:
deploy/docker/docker-compose.yml | 3 +
.../statefulset-dolphinscheduler-worker.yaml | 2 -
deploy/terraform/aws/dolphinscheduler-worker.tf | 4 --
.../dolphinscheduler-alert-server/pom.xml | 5 ++
.../apache/dolphinscheduler/alert/AlertConfig.java | 46 ---------------
.../apache/dolphinscheduler/alert/AlertServer.java | 59 ++++++-------------
.../dolphinscheduler/alert/config/AlertConfig.java | 68 ++++++++++++++++++++++
.../alert/{ => metrics}/AlertServerMetrics.java | 2 +-
.../alert/{ => plugin}/AlertPluginManager.java | 58 ++++++++++--------
.../alert/registry/AlertHeartbeatTask.java | 56 +++++++++---------
.../alert/registry/AlertRegistryClient.java | 40 +++++++------
.../alert/{ => rpc}/AlertRequestProcessor.java | 11 ++--
.../dolphinscheduler/alert/rpc/AlertRpcServer.java | 33 +++++------
.../AlertBootstrapService.java} | 36 +++++++-----
.../src/main/resources/application.yaml | 15 +++++
.../alert/AlertPluginManagerTest.java | 51 ----------------
...iceTest.java => AlertBootstrapServiceTest.java} | 24 ++++----
.../service/impl/MetricsCleanUpServiceImpl.java | 4 +-
.../api/service/impl/MonitorServiceImpl.java | 6 +-
.../api/service/impl/WorkerGroupServiceImpl.java | 8 +--
.../api/controller/WorkerGroupControllerTest.java | 4 +-
.../api/service/MonitorServiceTest.java | 6 +-
.../api/service/WorkerGroupServiceTest.java | 8 +--
.../common/constants/Constants.java | 6 --
.../dolphinscheduler/common/enums/NodeType.java | 22 -------
...terHeartBeat.java => AlertServerHeartBeat.java} | 8 +--
.../common/model/BaseHeartBeatTask.java | 6 +-
.../server/master/config/MasterConfig.java | 6 +-
.../master/registry/MasterRegistryClient.java | 13 ++---
.../registry/MasterRegistryDataListener.java | 13 ++---
.../server/master/registry/ServerNodeManager.java | 18 ++----
.../server/master/service/FailoverService.java | 7 +--
.../master/service/MasterFailoverService.java | 12 ++--
.../master/service/WorkerFailoverService.java | 4 +-
.../master/registry/MasterRegistryClientTest.java | 8 +--
.../server/master/service/FailoverServiceTest.java | 16 ++---
.../registry/api/RegistryClient.java | 67 ++++++++-------------
.../registry/api/enums/RegistryNodeType.java | 29 +++++----
.../service/cache/impl/CacheNotifyServiceImpl.java | 4 +-
.../service/cache/CacheNotifyServiceTest.java | 4 +-
.../src/main/resources/application.yaml | 15 ++---
.../server/worker/config/WorkerConfig.java | 4 --
.../worker/processor/TaskDispatchProcessor.java | 7 ++-
.../worker/registry/WorkerRegistryClient.java | 21 ++++++-
.../DefaultWorkerDelayTaskExecuteRunnable.java | 7 ++-
...faultWorkerDelayTaskExecuteRunnableFactory.java | 10 +++-
.../runner/WorkerDelayTaskExecuteRunnable.java | 7 ++-
.../WorkerDelayTaskExecuteRunnableFactory.java | 6 +-
.../worker/runner/WorkerTaskExecuteRunnable.java | 22 +++++--
.../WorkerTaskExecuteRunnableFactoryBuilder.java | 7 ++-
.../src/main/resources/application.yaml | 3 -
.../worker/registry/WorkerRegistryClientTest.java | 5 +-
.../DefaultWorkerDelayTaskExecuteRunnableTest.java | 9 ++-
53 files changed, 442 insertions(+), 473 deletions(-)
delete mode 100644
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertConfig.java
create mode 100644
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/config/AlertConfig.java
rename
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/{
=> metrics}/AlertServerMetrics.java (97%)
rename
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/{
=> plugin}/AlertPluginManager.java (81%)
copy
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/task/MasterHeartBeatTask.java
=>
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/registry/AlertHeartbeatTask.java
(56%)
copy
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/registry/WorkerStopStrategy.java
=>
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/registry/AlertRegistryClient.java
(52%)
rename
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/{
=> rpc}/AlertRequestProcessor.java (83%)
copy
dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/rpc/WorkerRpcServer.java
=>
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/rpc/AlertRpcServer.java
(66%)
rename
dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/{AlertSenderService.java
=> service/AlertBootstrapService.java} (94%)
delete mode 100644
dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/AlertPluginManagerTest.java
rename
dolphinscheduler-alert/dolphinscheduler-alert-server/src/test/java/org/apache/dolphinscheduler/alert/runner/{AlertSenderServiceTest.java
=> AlertBootstrapServiceTest.java} (89%)
delete mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/NodeType.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/{MasterHeartBeat.java
=> AlertServerHeartBeat.java} (88%)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/FavTask.java
=>
dolphinscheduler-registry/dolphinscheduler-registry-api/src/main/java/org/apache/dolphinscheduler/registry/api/enums/RegistryNodeType.java
(63%)