diff options
| author | zhanghongqing <[email protected]> | 2022-02-18 16:36:18 +0800 |
|---|---|---|
| committer | zhanghongqing <[email protected]> | 2022-02-18 16:36:18 +0800 |
| commit | a3c514b94c604ffe465018f2735738e309b3615d (patch) | |
| tree | cf1fd4c71e2780776d2285681d3db24f0a99c5b4 | |
| parent | 45e5944a0eaa7fa0142fd903d7834f75b7425990 (diff) | |
TSG-9530 修改存储配额clickhouse一天增量策略
| -rw-r--r-- | galaxy-job-executor/pom.xml | 2 | ||||
| -rw-r--r-- | galaxy-job-executor/src/main/java/com/mesalab/executor/service/StorageQuotaService.java | 14 |
2 files changed, 14 insertions, 2 deletions
diff --git a/galaxy-job-executor/pom.xml b/galaxy-job-executor/pom.xml index fc2e75b..967f8d5 100644 --- a/galaxy-job-executor/pom.xml +++ b/galaxy-job-executor/pom.xml @@ -158,7 +158,7 @@ <JAR_FILE>${project.build.finalName}.xjar</JAR_FILE> </buildArgs> <imageTags> - <imageTag>v1.3.220127</imageTag> + <imageTag>v1.3.220216-dev</imageTag> </imageTags> <resources> <resource> 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 fb3f934..2c13114 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 @@ -255,7 +255,19 @@ public class StorageQuotaService { traffic.put("used_size",getClickHouseCurr(dc.getValue())); traffic.put("max_size",getClickHouseMax(dc.getValue())); if(day){ - traffic.put("aggregate_size",getClickHouseDiff(dc.getValue())); + //昨日平均一天的5分钟粒度平均值 + long interval = 5; + long num = 24*60/interval; + Long ckDiffAvg = getClickHouseDiff(dc.getValue())/num; + for (int i = 0; i < num; i++) { + Map<String,Object> trafficAvg = new HashMap<>(); + trafficAvg.putAll(traffic); + trafficAvg.put("time", time); + trafficAvg.put("aggregate_size",ckDiffAvg); + data.add(trafficAvg); + time = time + interval*60;//转换为秒 + } + return errorCount; } data.add(traffic); } catch (BusinessException e) { |