From 8a63fdacdd28ed40d978cd6ceac04c05dd0ae94a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dean=5B=EB=B0=B1=EB=B3=91=EB=82=A8=5D?= Date: Tue, 10 Mar 2026 17:27:14 +0900 Subject: [PATCH] confict --- .../train/service/TmpDatasetService.java | 22 +++---------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java index fe555ae..7a58ce9 100644 --- a/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java +++ b/src/main/java/com/kamco/cd/training/train/service/TmpDatasetService.java @@ -70,7 +70,7 @@ public class TmpDatasetService { throw new IOException("No symlinks created."); } - log.info("tmp dataset created: {}, symlinksMade={}", tmp, linksMade); + log.info("tmp dataset created: {}, linksMade={}", tmp, linksMade); } private long link(Path tmp, String type, String part, String fullPath) throws IOException { @@ -92,28 +92,12 @@ public class TmpDatasetService { Files.delete(dst); } - try { - Files.createLink(dst, src); - log.info("hardlink created: {} -> {}", dst, src); - } catch (FileSystemException e) { - if (e.getMessage() != null && e.getMessage().contains("Invalid cross-device link")) { - log.warn( - "Hardlink failed due to cross-device link. Fallback to symlink. src={}, dst={}", - src, - dst); - Files.createSymbolicLink(dst, src); - } else { - throw e; - } - } + Files.createSymbolicLink(dst, src); + log.info("symlink created: {} -> {}", dst, src); return 1; } - private String safe(String s) { - return (s == null || s.isBlank()) ? null : s.trim(); - } - /** * request 전체 폴더 link *