From e9aa11a15db76aed8bb4b5509165b729aa7a43f9 Mon Sep 17 00:00:00 2001 From: lanyuanxiaoyao Date: Thu, 29 Feb 2024 18:30:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=A1=A5=E5=85=85b9=E9=9B=86?= =?UTF-8?q?=E7=BE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-b9.yml | 4 ++++ .../service/common/Constants.java | 2 ++ .../entity/yarn/YarnClusters.java | 3 +-- .../service/launcher/B9LauncherService.java | 11 --------- .../launcher/impl/B9LauncherService.java | 12 ++++++++++ .../quartz/distribute/cluster/B9Cluster.java | 23 +++++++++++++++++++ 6 files changed, 42 insertions(+), 13 deletions(-) delete mode 100644 service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/B9LauncherService.java create mode 100644 service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/impl/B9LauncherService.java create mode 100644 service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B9Cluster.java diff --git a/service-cli/service-cli-runner/src/main/resources/application-b9.yml b/service-cli/service-cli-runner/src/main/resources/application-b9.yml index 1fc183f..754b41f 100644 --- a/service-cli/service-cli-runner/src/main/resources/application-b9.yml +++ b/service-cli/service-cli-runner/src/main/resources/application-b9.yml @@ -27,6 +27,10 @@ deploy: authority: ENC(GXKnbq1LS11U2HaONspvH+D/TkIx13aWTaokdkzaF7HSvq6Z0Rv1+JUWFnYopVXu) username: ENC(moIO5mO39V1Z+RDwROK9JXY4GfM8ZjDgM6Si7wRZ1MPVjbhTpmLz3lz28rAiw7c2LeCmizfJzHkEXIwGlB280g==) darkcode: ENC(0jzpQ7T6S+P7bZrENgYsUoLhlqGvw7DA2MN3BRqEOwq7plhtg72vuuiPQNnr3DaYz0CpyTvxInhpx11W3VZ1trD6NINh7O3LN70ZqO5pWXk=) + yarn: + store-cluster: b9 + sync-clusters: b9 + compaction-clusters: b9 hosts: b9s1_hdp_dc: ip: 132.126.207.34 diff --git a/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java b/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java index ca17da3..dee2c4f 100644 --- a/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java +++ b/service-common/src/main/java/com/lanyuanxiaoyao/service/common/Constants.java @@ -190,11 +190,13 @@ public interface Constants { String COMPACTION_QUEUE_B5 = "compaction-queue-b5"; String COMPACTION_QUEUE_A4 = "compaction-queue-a4"; String COMPACTION_QUEUE_B12 = "compaction-queue-b12"; + String COMPACTION_QUEUE_B9 = "compaction-queue-b9"; String CLUSTER_B1 = "b1"; String CLUSTER_B5 = "b5"; String CLUSTER_A4 = "a4"; String CLUSTER_B12 = "b12"; + String CLUSTER_B9 = "b9"; String SCHEDULE_JOB_FAIL_COUNT = "SCHEDULE_JOB_FAIL_COUNT"; diff --git a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/yarn/YarnClusters.java b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/yarn/YarnClusters.java index 4191d94..74ca02f 100644 --- a/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/yarn/YarnClusters.java +++ b/service-configuration/src/main/java/com/lanyuanxiaoyao/service/configuration/entity/yarn/YarnClusters.java @@ -22,10 +22,9 @@ public class YarnClusters { MapUtil.builder() .put("a4", new Cluster("http://132.121.107.91:8088")) .put("b1", new Cluster("http://132.122.98.13:8088")) - .put("b4", new Cluster("http://132.122.112.30:8088")) .put("b5", new Cluster("http://132.122.116.12:8088")) - .put("t5", new Cluster("http://132.121.126.84:8088")) .put("b12", new Cluster("http://132.126.207.125:8088")) + .put("b9", new Cluster("http://132.126.207.32:8088")) .build() ); diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/B9LauncherService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/B9LauncherService.java deleted file mode 100644 index dd10275..0000000 --- a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/B9LauncherService.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.lanyuanxiaoyao.service.forest.service.launcher; - -import com.dtflys.forest.annotation.BaseRequest; - -/** - * @author lanyuanxiaoyao - * @date 2023-06-06 - */ -@BaseRequest(baseURL = "http://service-launcher-runner-b9") -public interface B9LauncherService extends LauncherService{ -} diff --git a/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/impl/B9LauncherService.java b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/impl/B9LauncherService.java new file mode 100644 index 0000000..97b0ef6 --- /dev/null +++ b/service-forest/src/main/java/com/lanyuanxiaoyao/service/forest/service/launcher/impl/B9LauncherService.java @@ -0,0 +1,12 @@ +package com.lanyuanxiaoyao.service.forest.service.launcher.impl; + +import com.dtflys.forest.annotation.BaseRequest; +import com.lanyuanxiaoyao.service.forest.service.launcher.LauncherService; + +/** + * @author lanyuanxiaoyao + * @date 2023-06-06 + */ +@BaseRequest(baseURL = "http://service-launcher-runner-b9") +public interface B9LauncherService extends LauncherService { +} diff --git a/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B9Cluster.java b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B9Cluster.java new file mode 100644 index 0000000..f9cc348 --- /dev/null +++ b/service-scheduler/src/main/java/com/lanyuanxiaoyao/service/scheduler/quartz/distribute/cluster/B9Cluster.java @@ -0,0 +1,23 @@ +package com.lanyuanxiaoyao.service.scheduler.quartz.distribute.cluster; + +import com.lanyuanxiaoyao.service.common.Constants; +import com.lanyuanxiaoyao.service.forest.service.YarnService; +import org.springframework.cloud.client.discovery.DiscoveryClient; +import org.springframework.stereotype.Component; + +/** + * A4 + * + * @author lanyuanxiaoyao + * @date 2023-06-08 + */ +@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection") +@Component +public class B9Cluster extends Cluster { + public B9Cluster(DiscoveryClient client, YarnService yarnService) { + super( + Constants.CLUSTER_B9, + Constants.COMPACTION_QUEUE_B9 + ); + } +}