summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhanghongqing <[email protected]>2020-09-27 16:19:56 +0800
committerzhanghongqing <[email protected]>2020-09-27 16:19:56 +0800
commit6ddce5d8a5fb8f77ee9c7f4c4bee823ab6374fbf (patch)
treed4f5cc1c484c682a865b56e0ec297f06dd6df2bb
parent389e37f62e595ee5ea75312c25fede9f7a241c89 (diff)
1.修改druid 配置一个地址即可
-rw-r--r--galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/StorgeConfig.java7
-rw-r--r--galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java4
-rw-r--r--galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java2
-rw-r--r--galaxy-job-executor/src/main/resources/application-executor.yml4
4 files changed, 6 insertions, 11 deletions
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/StorgeConfig.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/StorgeConfig.java
index 6b683fc..6276343 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/StorgeConfig.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/config/StorgeConfig.java
@@ -34,11 +34,8 @@ public class StorgeConfig {
private String systemTables ;
- @Value("${storge.analytic.server.select}")
- private String analyticServerSelect;// druid 查询节点ip和port
-
- @Value("${storge.analytic.server.delete}")
- private String analyticServerDelete;// druid 删除节点ip和port
+ @Value("${storge.analytic.server}")
+ private String analyticServer;// druid 节点ip和port
@Value("${storge.files.hos-server}")
private String filesHosServer;// 清库删除文件服务器 ip:port
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
index 3af4b49..e15f3ee 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
@@ -67,8 +67,8 @@ public class LogStorageQuotaJob {
systemTables = deletionConfig.getSystemTables();
//druid
- analyticServerSelect = Joiner.on("").join(Constant.HTTP, deletionConfig.getAnalyticServerSelect(), "/druid/v2/sql");
- analyticServerDelete = deletionConfig.getAnalyticServerDelete();
+ analyticServerSelect = Joiner.on("").join(Constant.HTTP, deletionConfig.getAnalyticServer(), "/druid/v2/sql");
+ analyticServerDelete = deletionConfig.getAnalyticServer();
//hos
filesHosServer = deletionConfig.getFilesHosServer();
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java
index f3b08e9..b8065b9 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java
@@ -87,7 +87,7 @@ public class StorageQuotaService {
systemParts = config.getSystemParts();
systemDisks = config.getSystemDisks();
- queryDruidUrl = Joiner.on("").join(Constant.HTTP, config.getAnalyticServerSelect(), "/druid/v2/sql");
+ queryDruidUrl = Joiner.on("").join(Constant.HTTP, config.getAnalyticServer(), "/druid/v2/sql");
queryHdfsUrls = config.getFilesHdfsServer();
hbaselinuxDir = config.getHbaseLinuxDir();
hbaseHdfsDir = config.getHbaseHdfsDir();
diff --git a/galaxy-job-executor/src/main/resources/application-executor.yml b/galaxy-job-executor/src/main/resources/application-executor.yml
index 22c5144..06292b7 100644
--- a/galaxy-job-executor/src/main/resources/application-executor.yml
+++ b/galaxy-job-executor/src/main/resources/application-executor.yml
@@ -19,9 +19,7 @@ storge:
## 存储配额查询druid
analytic:
- server:
- select: 192.168.40.223:8082
- delete: 192.168.40.151:8081
+ server: 192.168.40.223:8888
## 存储配额查询 clickhouse
traffic:
server: 192.168.44.12:8123