From 31c94bc70c374da84241efb81537f5de35576238 Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 11:26:08 +0800 Subject: [PATCH 1/9] [Improvement][service] Remove fixed component versions --- .../java/com/datasophon/api/master/PrometheusActor.java | 6 +++--- .../api/service/impl/ClusterYarnQueueServiceImpl.java | 4 ++-- .../main/java/com/datasophon/api/utils/ProcessUtils.java | 4 ++-- .../java/com/datasophon/worker/utils/FreemakerUtils.java | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/datasophon-service/src/main/java/com/datasophon/api/master/PrometheusActor.java b/datasophon-service/src/main/java/com/datasophon/api/master/PrometheusActor.java index 15a88c0a..160be197 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/master/PrometheusActor.java +++ b/datasophon-service/src/main/java/com/datasophon/api/master/PrometheusActor.java @@ -130,7 +130,7 @@ public void onReceive(Object msg) throws Throwable { serviceRoleInfo.setName("Prometheus"); serviceRoleInfo.setParentName("PROMETHEUS"); serviceRoleInfo.setConfigFileMap(configFileMap); - serviceRoleInfo.setDecompressPackageName("prometheus-2.17.2"); + serviceRoleInfo.setDecompressPackageName("prometheus"); if (Objects.nonNull(prometheusInstance)) { serviceRoleInfo.setHostname(prometheusInstance.getHostname()); ServiceConfigureHandler configureHandler = new ServiceConfigureHandler(); @@ -208,7 +208,7 @@ public void onReceive(Object msg) throws Throwable { serviceRoleInfo.setName("Prometheus"); serviceRoleInfo.setParentName("PROMETHEUS"); serviceRoleInfo.setConfigFileMap(configFileMap); - serviceRoleInfo.setDecompressPackageName("prometheus-2.17.2"); + serviceRoleInfo.setDecompressPackageName("prometheus"); serviceRoleInfo.setHostname(prometheusInstance.getHostname()); ServiceConfigureHandler configureHandler = new ServiceConfigureHandler(); ExecResult execResult = configureHandler.handlerRequest(serviceRoleInfo); @@ -314,7 +314,7 @@ public void onReceive(Object msg) throws Throwable { serviceRoleInfo.setName("Prometheus"); serviceRoleInfo.setParentName("PROMETHEUS"); serviceRoleInfo.setConfigFileMap(configFileMap); - serviceRoleInfo.setDecompressPackageName("prometheus-2.17.2"); + serviceRoleInfo.setDecompressPackageName("prometheus"); serviceRoleInfo.setHostname(prometheusInstance.getHostname()); ServiceConfigureHandler configureHandler = new ServiceConfigureHandler(); ExecResult execResult = configureHandler.handlerRequest(serviceRoleInfo); diff --git a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterYarnQueueServiceImpl.java b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterYarnQueueServiceImpl.java index bb085847..7f45e20e 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterYarnQueueServiceImpl.java +++ b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterYarnQueueServiceImpl.java @@ -128,7 +128,7 @@ public Result refreshQueues(Integer clusterId) throws Exception { serviceRoleInfo.setName("ResourceManager"); serviceRoleInfo.setParentName("YARN"); serviceRoleInfo.setConfigFileMap(configFileMap); - serviceRoleInfo.setDecompressPackageName("hadoop-3.3.6"); + serviceRoleInfo.setDecompressPackageName("hadoop"); serviceRoleInfo.setHostname(roleInstanceEntity.getHostname()); ServiceConfigureHandler configureHandler = new ServiceConfigureHandler(); ExecResult execResult = configureHandler.handlerRequest(serviceRoleInfo); @@ -144,7 +144,7 @@ public Result refreshQueues(Integer clusterId) throws Exception { ExecuteCmdCommand command = new ExecuteCmdCommand(); Timeout timeout = new Timeout(Duration.create(180, TimeUnit.SECONDS)); ArrayList commands = new ArrayList<>(); - commands.add(Constants.INSTALL_PATH + "/hadoop-3.3.6/bin/yarn"); + commands.add(Constants.INSTALL_PATH + "/hadoop/bin/yarn"); commands.add("rmadmin"); commands.add("-refreshQueues"); command.setCommands(commands); diff --git a/datasophon-service/src/main/java/com/datasophon/api/utils/ProcessUtils.java b/datasophon-service/src/main/java/com/datasophon/api/utils/ProcessUtils.java index 558b324a..8c383dff 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/utils/ProcessUtils.java +++ b/datasophon-service/src/main/java/com/datasophon/api/utils/ProcessUtils.java @@ -479,7 +479,7 @@ public static void hdfsEcMethond(Integer serviceInstanceId, ClusterServiceRoleIn Timeout timeout = new Timeout(Duration.create(180, TimeUnit.SECONDS)); FileOperateCommand fileOperateCommand = new FileOperateCommand(); fileOperateCommand.setLines(list); - fileOperateCommand.setPath(Constants.INSTALL_PATH + "/hadoop-3.3.6/etc/hadoop/" + type); + fileOperateCommand.setPath(Constants.INSTALL_PATH + "/hadoop/etc/hadoop/" + type); Future future = Patterns.ask(actorSelection, fileOperateCommand, timeout); ExecResult fileOperateResult = (ExecResult) Await.result(future, timeout.duration()); if (Objects.nonNull(fileOperateResult) && fileOperateResult.getExecResult()) { @@ -487,7 +487,7 @@ public static void hdfsEcMethond(Integer serviceInstanceId, ClusterServiceRoleIn // 刷新白名单 ExecuteCmdCommand command = new ExecuteCmdCommand(); ArrayList commands = new ArrayList<>(); - commands.add(Constants.INSTALL_PATH + "/hadoop-3.3.6/bin/hdfs"); + commands.add(Constants.INSTALL_PATH + "/hadoop/bin/hdfs"); commands.add("dfsadmin"); commands.add("-refreshNodes"); command.setCommands(commands); diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/utils/FreemakerUtils.java b/datasophon-worker/src/main/java/com/datasophon/worker/utils/FreemakerUtils.java index 2b2d9e29..879fdf97 100644 --- a/datasophon-worker/src/main/java/com/datasophon/worker/utils/FreemakerUtils.java +++ b/datasophon-worker/src/main/java/com/datasophon/worker/utils/FreemakerUtils.java @@ -134,7 +134,7 @@ public static void generatePromAlertFile(Generators generators, List data.put("itemList", configs); data.put("serviceName", serviceName); // 3.产生输出 - processOut(generators, template, data, "prometheus-2.17.2"); + processOut(generators, template, data, "prometheus"); } public static void generatePromScrapeConfig(Generators generators, List configs, From 3e9a13e0e507391c24fd8149a6b82de0d80c3fff Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 18:03:43 +0800 Subject: [PATCH 2/9] =?UTF-8?q?[Improvement][api]=E4=BC=98=E5=8C=96ALERTMA?= =?UTF-8?q?NAGER=E5=AE=89=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" From 41d54a1185e0212d7616ad7611be8ff35799e639 Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 18:12:11 +0800 Subject: [PATCH 3/9] =?UTF-8?q?[Bug][service]=20HADOOP=5FHOME=E5=8F=98?= =?UTF-8?q?=E9=87=8F=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasophon/api/service/impl/ClusterInfoServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java index 6f1eb2fe..c197eb44 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java +++ b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java @@ -157,8 +157,10 @@ private void putClusterVariable(ClusterInfoEntity clusterInfo) { globalVariables.put("${INSTALL_PATH}", Constants.INSTALL_PATH); globalVariables.put("${apiHost}", CacheUtils.getString("hostname")); globalVariables.put("${apiPort}", configBean.getServerPort()); - globalVariables.put("${HADOOP_HOME}", Constants.INSTALL_PATH + Constants.SLASH - + PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS")); + String path = PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS") == null + ? Constants.INSTALL_PATH + Constants.SLASH + "hadoop" + : Constants.INSTALL_PATH + Constants.SLASH + PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS"); + globalVariables.put("${HADOOP_HOME}", path); GlobalVariables.put(clusterInfo.getId(), globalVariables); } From b2c8337391cc6d78aa7004f8a6036fc76158580e Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 18:21:17 +0800 Subject: [PATCH 4/9] =?UTF-8?q?Revert=20"[Improvement][api]=E4=BC=98?= =?UTF-8?q?=E5=8C=96ALERTMANAGER=E5=AE=89=E8=A3=85"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3e9a13e0e507391c24fd8149a6b82de0d80c3fff. --- .../main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json index 2952b7e6..21da7414 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "${apiHost}:${apiPort}", + "value": "", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json index 2952b7e6..21da7414 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "${apiHost}:${apiPort}", + "value": "", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json index 2952b7e6..21da7414 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "${apiHost}:${apiPort}", + "value": "", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" From edc95db656a6d3388aacd9a36948bc258c11168a Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 18:23:36 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasophon/api/service/impl/ClusterInfoServiceImpl.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java index c197eb44..6f1eb2fe 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java +++ b/datasophon-service/src/main/java/com/datasophon/api/service/impl/ClusterInfoServiceImpl.java @@ -157,10 +157,8 @@ private void putClusterVariable(ClusterInfoEntity clusterInfo) { globalVariables.put("${INSTALL_PATH}", Constants.INSTALL_PATH); globalVariables.put("${apiHost}", CacheUtils.getString("hostname")); globalVariables.put("${apiPort}", configBean.getServerPort()); - String path = PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS") == null - ? Constants.INSTALL_PATH + Constants.SLASH + "hadoop" - : Constants.INSTALL_PATH + Constants.SLASH + PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS"); - globalVariables.put("${HADOOP_HOME}", path); + globalVariables.put("${HADOOP_HOME}", Constants.INSTALL_PATH + Constants.SLASH + + PackageUtils.getServiceDcPackageName(clusterInfo.getClusterFrame(), "HDFS")); GlobalVariables.put(clusterInfo.getId(), globalVariables); } From d91a73505cf6e306ef4716b683baf882f6ef378c Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Mon, 12 Aug 2024 18:25:12 +0800 Subject: [PATCH 6/9] =?UTF-8?q?[Improvement][api]=E4=BC=98=E5=8C=96alertma?= =?UTF-8?q?nager=E5=AE=89=E8=A3=85=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json | 2 +- .../main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.0/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.1/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" diff --git a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json index 21da7414..2952b7e6 100644 --- a/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json +++ b/datasophon-api/src/main/resources/meta/DDP-1.2.2/ALERTMANAGER/service_ddl.json @@ -79,7 +79,7 @@ "configType": "map", "required": true, "type": "input", - "value": "", + "value": "${apiHost}:${apiPort}", "configurableInWizard": true, "hidden": false, "defaultValue": "${apiHost}:${apiPort}" From bd532decf4cabc67040961cf4044ee4e147c525d Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Wed, 14 Aug 2024 10:30:06 +0800 Subject: [PATCH 7/9] =?UTF-8?q?[Improvement][worker]Fix-=E6=BA=90=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E5=88=99=E8=BD=AF?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=88=9B=E5=BB=BA=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../worker/strategy/resource/LinkStrategy.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java index 49e5a772..699f9cb4 100644 --- a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java +++ b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java @@ -26,11 +26,16 @@ public void exec() { String realTarget = basePath + Constants.SLASH + target; File sourceFile = new File(source); File targetFile = new File(realTarget); - if (!targetFile.exists() && sourceFile.exists()) { - // 先创建文件夹 - FileUtil.mkdir(targetFile.getParent()); - ShellUtils.exceShell("ln -s " + source + " " + realTarget); - log.info("Create symbolic dir: {} to {}", source, realTarget); + FileUtil.mkdir(targetFile.getParent()); + ShellUtils.exceShell("ln -s " + source + " " + realTarget); + + if (!targetFile.exists()) { + if (sourceFile.exists()) { + log.info("Create existing symbolic dir: {} to {}", source, realTarget); + } else { + log.warn("Create non-existent symbolic dir: {} to {}", source, realTarget); + } } + } -} +} \ No newline at end of file From c461e6180728043cc5c8047f33566a031a72a7ef Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Wed, 14 Aug 2024 10:32:32 +0800 Subject: [PATCH 8/9] no message --- .../com/datasophon/worker/strategy/resource/LinkStrategy.java | 1 - 1 file changed, 1 deletion(-) diff --git a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java index 699f9cb4..8376b47a 100644 --- a/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java +++ b/datasophon-worker/src/main/java/com/datasophon/worker/strategy/resource/LinkStrategy.java @@ -36,6 +36,5 @@ public void exec() { log.warn("Create non-existent symbolic dir: {} to {}", source, realTarget); } } - } } \ No newline at end of file From 3e26b0e7d1fbd19f231e570835dc3000d63e25b1 Mon Sep 17 00:00:00 2001 From: blackflash997 Date: Thu, 15 Aug 2024 11:25:12 +0800 Subject: [PATCH 9/9] =?UTF-8?q?[Bug][Service]=E4=B8=8D=E5=90=AF=E7=94=A8HD?= =?UTF-8?q?FS=E7=BB=84=E4=BB=B6=E6=83=85=E5=86=B5=E4=B8=8BHADOOP=5FHOME?= =?UTF-8?q?=E5=8F=98=E9=87=8F=E4=BC=9A=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datasophon/api/load/LoadServiceMeta.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/datasophon-service/src/main/java/com/datasophon/api/load/LoadServiceMeta.java b/datasophon-service/src/main/java/com/datasophon/api/load/LoadServiceMeta.java index cef335b9..69af3347 100644 --- a/datasophon-service/src/main/java/com/datasophon/api/load/LoadServiceMeta.java +++ b/datasophon-service/src/main/java/com/datasophon/api/load/LoadServiceMeta.java @@ -141,6 +141,27 @@ public void run(ApplicationArguments args) throws Exception { } } } + checkHadoopHomeVariable(frameCode,clusters); + } + } + + /** + * 检查HADOOP_HOME变量，避免变量丢失 + * @param frameCode + * @param clusters + */ + private void checkHadoopHomeVariable(String frameCode, + List clusters) { + for (ClusterInfoEntity cluster : clusters) { + if (cluster.getClusterFrame().equals(frameCode)) { + Map globalVariables = GlobalVariables.get(cluster.getId()); + // load global variable, 加载 frame + boolean containsHadoopHome = globalVariables.containsKey("HADOOP_HOME"); + if (!containsHadoopHome) { + // 如果Map中包含"HADOOP_HOME"，则执行相关操作 + globalVariables.put("${HADOOP_HOME}",Constants.INSTALL_PATH + Constants.SLASH + "hadoop"); + } + } } }