From 575eee98ca763ff1d24a79ef558ef1167c5c13df Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 23 Jan 2026 17:44:08 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=83=81=ED=83=9C?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/InferenceResultService.java | 48 ++++++++++++------- .../MapSheetLearnRepositoryImpl.java | 6 +-- src/main/resources/application-dev.yml | 3 +- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index f916b6f2..60fe3de2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -46,6 +46,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.Optional; import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; @@ -81,9 +82,14 @@ public class InferenceResultService { @Value("${inference.batch-url}") private String batchUrl; + @Value("${inference.inference-server-name}") + private String inferenceServerName; + @Value("${file.dataset-dir}") private String datasetDir; + + @Value("${spring.profiles.active}") private String profile; @@ -516,44 +522,46 @@ public class InferenceResultService { public List getInferenceServerStatusList() { + String[] serverNames = inferenceServerName.split(","); + int serveCnt = serverNames.length; + List dtoList = inferenceResultCoreService.getInferenceServerStatusList(); int size = dtoList.size(); + List serverStatusList = new ArrayList<>(); + System.out.println("size =" + size); if (size == 0) { - for (int k = 1; k <= 4; k++) { + for (int k = 0; k < serveCnt; k++) { InferenceServerStatusDto dto = new InferenceServerStatusDto(); - dto.setServerName("server" + k); + dto.setServerName(serverNames[k]); dto.setCpu_user(0); dto.setCpu_system(0); dto.setMemused(0); dto.setKbmemused(0L); dto.setGpuUtil(0); - dtoList.add(dto); + serverStatusList.add(dto); } } else { - for (int k = 1; k <= 4; k++) { - String srvNm = "server" + k; + for (int k = 0; k < serveCnt; k++) { + String srvNm = serverNames[k]; String srvNmChk = "N"; - int serverCnt = - (int) - dtoList.stream().filter(dto -> dto.getServerName().toString().equals(srvNm)).count(); + Optional matchingDto = dtoList.stream() + .filter(dto -> srvNm.equals(dto.getServerName())) + .findFirst(); /* - for (InferenceServerStatusDto dto : dtoList) { - if (srvNm.equals(dto.getServerName())) { - srvNmChk = "Y"; - break; - } - } + int serverChekcCnt = + (int) + dtoList.stream().filter(dto -> dto.getServerName().toString().equals(srvNm)).count(); */ - if (serverCnt == 0) { + if (matchingDto.isEmpty()) { InferenceServerStatusDto dto = new InferenceServerStatusDto(); dto.setServerName(srvNm); dto.setCpu_user(0); @@ -561,16 +569,20 @@ public class InferenceResultService { dto.setMemused(0); dto.setKbmemused(0L); dto.setGpuUtil(0); - dtoList.add(dto); + serverStatusList.add(dto); + } + else + { + serverStatusList.add(matchingDto.get()); } } } - dtoList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName)); + serverStatusList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName)); - return dtoList; + return serverStatusList; } /** diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 919cc91c..1e099d78 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -153,8 +153,6 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto systemMetricEntity.memused, systemMetricEntity.kbmemused, gpuMetricEntity.gpuUtil - // gpuMetricEntity.gpuMemUsed, - // gpuMetricEntity.gpuMemTotal )) .from(systemMetricEntity) .leftJoin(gpuMetricEntity) @@ -163,7 +161,9 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto .timestamp .in(latestGpuIds) .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))) - .where(systemMetricEntity.timestamp.in(latestIds)) // In 절 사용 + .where(systemMetricEntity.timestamp.in(latestIds) + //.and(systemMetricEntity.serverName.ne("server2")) + ) // In 절 사용 .orderBy(systemMetricEntity.serverName.asc()) .limit(4) .fetch(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index c22952d8..554f7de9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -92,7 +92,7 @@ file: sync-root-dir: /kamco-nfs/images/ sync-tmp-dir: ${file.sync-root-dir}/tmp sync-file-extention: tfw,tif - sync-auto-exception-start-year: 2025 + sync-auto-exception-start-year: 2024 sync-auto-exception-before-year-cnt: 3 #dataset-dir: D:/kamco-nfs/dataset/ @@ -109,6 +109,7 @@ inference: batch-url: http://10.100.0.11:8000/batches geojson-dir: /kamco-nfs/requests/ jar-path: /kamco-nfs/dataset/shp_exporter-1.0.0.jar + inference-server-name: server1,server2,server3,server4 gukyuin: #url: http://localhost:8080 From 1bb0ca2e40df4565533ec7dabb98af1ca23b8303 Mon Sep 17 00:00:00 2001 From: Moon Date: Fri, 23 Jan 2026 17:48:55 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=84=9C=EB=B2=84=EC=83=81=ED=83=9C?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kamcoback/inference/service/InferenceResultService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 52dcf3b8..62449ebd 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -82,6 +82,10 @@ public class InferenceResultService { @Value("${inference.batch-url}") private String batchUrl; + @Value("${inference.inference-server-name}") + private String inferenceServerName; + + @Value("${file.dataset-dir}") private String datasetDir; From dfd617ed964bcdc38a9db0beb6321e39a753ccf1 Mon Sep 17 00:00:00 2001 From: teddy Date: Fri, 23 Jan 2026 17:51:16 +0900 Subject: [PATCH 3/3] =?UTF-8?q?soptless=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/InferenceResultService.java | 16 +++++----------- .../Inference/MapSheetLearnRepositoryImpl.java | 10 +++++----- src/main/resources/application-prod.yml | 1 + 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java index 62449ebd..a1ed7e9a 100644 --- a/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java +++ b/src/main/java/com/kamco/cd/kamcoback/inference/service/InferenceResultService.java @@ -85,7 +85,6 @@ public class InferenceResultService { @Value("${inference.inference-server-name}") private String inferenceServerName; - @Value("${file.dataset-dir}") private String datasetDir; @@ -522,13 +521,13 @@ public class InferenceResultService { public List getInferenceServerStatusList() { String[] serverNames = inferenceServerName.split(","); - int serveCnt = serverNames.length; + int serveCnt = serverNames.length; List dtoList = inferenceResultCoreService.getInferenceServerStatusList(); int size = dtoList.size(); - List serverStatusList = new ArrayList<>(); + List serverStatusList = new ArrayList<>(); System.out.println("size =" + size); @@ -550,9 +549,8 @@ public class InferenceResultService { String srvNm = serverNames[k]; String srvNmChk = "N"; - Optional matchingDto = dtoList.stream() - .filter(dto -> srvNm.equals(dto.getServerName())) - .findFirst(); + Optional matchingDto = + dtoList.stream().filter(dto -> srvNm.equals(dto.getServerName())).findFirst(); /* int serverChekcCnt = @@ -569,14 +567,10 @@ public class InferenceResultService { dto.setKbmemused(0L); dto.setGpuUtil(0); serverStatusList.add(dto); - } - else - { + } else { serverStatusList.add(matchingDto.get()); } - } - } serverStatusList.sort(Comparator.comparing(InferenceServerStatusDto::getServerName)); diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java index 1e099d78..d6d1d719 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/Inference/MapSheetLearnRepositoryImpl.java @@ -152,8 +152,7 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto systemMetricEntity.cpuSystem, systemMetricEntity.memused, systemMetricEntity.kbmemused, - gpuMetricEntity.gpuUtil - )) + gpuMetricEntity.gpuUtil)) .from(systemMetricEntity) .leftJoin(gpuMetricEntity) .on( @@ -161,9 +160,10 @@ public class MapSheetLearnRepositoryImpl implements MapSheetLearnRepositoryCusto .timestamp .in(latestGpuIds) .and(gpuMetricEntity.serverName.eq(systemMetricEntity.serverName))) - .where(systemMetricEntity.timestamp.in(latestIds) - //.and(systemMetricEntity.serverName.ne("server2")) - ) // In 절 사용 + .where( + systemMetricEntity.timestamp.in(latestIds) + // .and(systemMetricEntity.serverName.ne("server2")) + ) // In 절 사용 .orderBy(systemMetricEntity.serverName.asc()) .limit(4) .fetch(); diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index e5aee003..59ceca5d 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -64,6 +64,7 @@ inference: batch-url: http://10.100.0.11:8000/batches geojson-dir: /kamco-nfs/requests/ jar-path: /kamco-nfs/dataset/shp_exporter-1.0.0.jar + inference-server-name: server1,server2,server3,server4 gukyuin: #url: http://localhost:8080