From 7ed2a4004d72c24dc74767893d17849aaf03fa2d Mon Sep 17 00:00:00 2001 From: yoon6yo Date: Sat, 14 Nov 2026 16:45:39 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20=EC=8B=A0=EC=B2=AD=20=EB=95=8C=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EB=84=A4=EC=9E=84=20=EA=B2=80=EC=82=AC?= =?UTF-8?q?=EC=99=80=20GPU=20=EC=82=AC=EC=9A=A9=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=9E=90=20=EC=9D=B4=EB=A6=84=EC=9D=84=20?= =?UTF-8?q?=EC=8B=A0=EC=B2=AD=20=EC=84=9C=EB=B2=84=20=EA=B8=B0=EC=A4=80?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=9D=BD=EA=B3=A0=20=EC=84=9C=EB=B2=84?= =?UTF-8?q?=EB=B3=84=20=EA=B3=84=EC=A0=95=20=EB=B3=80=EA=B2=BD=EB=8F=84=20?= =?UTF-8?q?=EC=8B=9C=ED=8A=B8=20=EB=8F=99=EA=B8=B0=ED=99=94=EB=A5=BC=20?= =?UTF-8?q?=EC=9D=BC=EC=9C=BC=ED=82=A4=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/monitoring/service/MyGpuUsageService.java | 4 ++-- .../requests/service/RequestCommandService.java | 2 +- .../admin_be/domain/users/entity/UbuntuAccount.java | 2 ++ .../monitoring/service/MyGpuUsageServiceTest.java | 12 ++++++++++++ 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageService.java b/src/main/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageService.java index 73c4f319..287f8e27 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageService.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageService.java @@ -301,7 +301,7 @@ private void resolveOwners(List procMem, Map podOwners, M Map ownerByPod = new HashMap<>(); for (Request r : requestRepository.findAllByPodNameIn(new HashSet<>(podByContainer.values()))) { ownerByPod.put(r.getPodName(), new Owner(ownerKey(r), r.getUser().getUserId(), r.getUser().getName(), - r.getUser().getUbuntuUsername(), r.getRequestId())); + r.getUbuntuUsername(), r.getRequestId())); } podByContainer.forEach((cid, pod) -> { if (ownerByPod.containsKey(pod)) podOwners.put(cid, ownerByPod.get(pod)); @@ -341,7 +341,7 @@ private void fillPodRam(Map podByContainer, Map /** 같은 사용자는 Pod든 옛 Docker 컨테이너든 같은 키가 되도록 우분투 계정을 쓴다. */ static String ownerKey(Request r) { - String name = r.getUser().getUbuntuUsername(); + String name = r.getUbuntuUsername(); return name != null && !name.isBlank() ? name : "id:" + r.getUser().getUserId(); } diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/RequestCommandService.java b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/RequestCommandService.java index af2d4b14..b7140868 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/RequestCommandService.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/requests/service/RequestCommandService.java @@ -252,7 +252,7 @@ public SaveRequestResponseDTO createRequest(Long userId, SaveRequestRequestDTO d .orElseThrow(() -> new BusinessException(ErrorCode.RESOURCE_NOT_FOUND)); // 유저네임은 신청마다 고르는 값이 아니라 가입 시 정해진 웹 계정의 고정값이다. - String ubuntuUsername = user.getUbuntuUsername(); + String ubuntuUsername = user.ubuntuUsernameOn(rg.getServerName()); if (ubuntuUsername == null || ubuntuUsername.isBlank()) { throw new BusinessException(ErrorCode.UBUNTU_USERNAME_NOT_ASSIGNED); } diff --git a/src/main/java/DGU_AI_LAB/admin_be/domain/users/entity/UbuntuAccount.java b/src/main/java/DGU_AI_LAB/admin_be/domain/users/entity/UbuntuAccount.java index 73e56990..a3689511 100644 --- a/src/main/java/DGU_AI_LAB/admin_be/domain/users/entity/UbuntuAccount.java +++ b/src/main/java/DGU_AI_LAB/admin_be/domain/users/entity/UbuntuAccount.java @@ -3,6 +3,7 @@ import DGU_AI_LAB.admin_be.error.ErrorCode; import DGU_AI_LAB.admin_be.error.exception.BusinessException; import DGU_AI_LAB.admin_be.global.common.BaseTimeEntity; +import DGU_AI_LAB.admin_be.global.event.RequestRowChangeListener; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Getter; @@ -14,6 +15,7 @@ * 같은 번호·같은 홈으로 돌아온다. */ @Entity +@EntityListeners(RequestRowChangeListener.class) @Table(name = "ubuntu_accounts", uniqueConstraints = { @UniqueConstraint(name = "uk_ubuntu_accounts_user_server", columnNames = {"user_id", "server_name"}), @UniqueConstraint(name = "uk_ubuntu_accounts_server_username", columnNames = {"server_name", "username"}), diff --git a/src/test/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageServiceTest.java b/src/test/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageServiceTest.java index 19add89b..d6bdf015 100644 --- a/src/test/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageServiceTest.java +++ b/src/test/java/DGU_AI_LAB/admin_be/domain/monitoring/service/MyGpuUsageServiceTest.java @@ -52,6 +52,7 @@ private Request request(Long userId, String pod, String node) { when(user.getUbuntuUsername()).thenReturn("u" + userId); Request r = mock(Request.class); when(r.getUser()).thenReturn(user); + when(r.getUbuntuUsername()).thenReturn("u" + userId); when(r.getPodName()).thenReturn(pod); when(r.getNodeName()).thenReturn(node); when(r.getStatus()).thenReturn(Status.FULFILLED); @@ -305,4 +306,15 @@ void metricsFailureMeansEmpty() { // 빈 목록('GPU 없음')으로 숨기지 않고 오류로 알린다. assertThatThrownBy(() -> service.getMyGpuUsage(10L, 1L)).isInstanceOf(BusinessException.class); } + + @Test + @DisplayName("소유자 키는 신청의 서버 기준 유저네임이다 — 서버마다 이름이 다른 사람도 그 서버 컨테이너에서 같은 키가 된다") + void ownerKeyUsesRequestServerUsername() { + Request r = request(7L, "pod-lab", "node-a"); + when(r.getUbuntuUsername()).thenReturn("lab_name"); + assertThat(MyGpuUsageService.ownerKey(r)).isEqualTo("lab_name"); + + when(r.getUbuntuUsername()).thenReturn(" "); + assertThat(MyGpuUsageService.ownerKey(r)).isEqualTo("id:7"); + } }