From 2b53990a0742d43486a7329078e86e2c511bd4a5 Mon Sep 17 00:00:00 2001 From: kric_jspark Date: Fri, 2 Oct 2026 14:21:58 +0900 Subject: [PATCH] =?UTF-8?q?261002=5F01=5FBUG:=20=EB=8F=99=EC=8B=9C=20?= =?UTF-8?q?=EC=84=A4=EB=AC=B8=20=EC=9D=B4=EB=A0=A5=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=EC=8B=9C=20START=EA=B0=80=20=EC=99=84=EB=A3=8C=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EB=A5=BC=20=EB=8D=AE=EC=96=B4=EC=93=B0=EB=8A=94=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20(semaphore=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/ListEventHistoryProperties.java | 17 ++++ .../repository/ListEventHistRepository.java | 8 -- .../repository/ListEventLatestRepository.java | 15 ++++ .../server/service/ListUpdateService.java | 78 ++++++++++++++++++- src/main/resources/application.yml | 3 + 5 files changed, 112 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/kri/contact/server/config/ListEventHistoryProperties.java create mode 100644 src/main/java/com/kri/contact/server/persistence/repository/ListEventLatestRepository.java diff --git a/src/main/java/com/kri/contact/server/config/ListEventHistoryProperties.java b/src/main/java/com/kri/contact/server/config/ListEventHistoryProperties.java new file mode 100644 index 0000000..ca4de70 --- /dev/null +++ b/src/main/java/com/kri/contact/server/config/ListEventHistoryProperties.java @@ -0,0 +1,17 @@ +package com.kri.contact.server.config; + +import jakarta.validation.constraints.Min; +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.validation.annotation.Validated; + +@Getter +@Setter +@Validated +@ConfigurationProperties(prefix = "kri.list-event-history") +public class ListEventHistoryProperties { + + @Min(value = 1, message = "설문 이력 잠금 대기 시간은 0초보다 커야 합니다.") + private long surveyLockWaitTimeoutSeconds; +} diff --git a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java index 206c750..eaedf2d 100644 --- a/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java +++ b/src/main/java/com/kri/contact/server/persistence/repository/ListEventHistRepository.java @@ -14,14 +14,6 @@ public interface ListEventHistRepository extends JpaRepository { + + boolean existsByPrjctIdxAndPrjctSurveyIdxAndSidAndEventTyAndResultCdNot( + Long prjctIdx, + Long prjctSurveyIdx, + String sid, + Short eventTy, + Integer resultCd + ); +} diff --git a/src/main/java/com/kri/contact/server/service/ListUpdateService.java b/src/main/java/com/kri/contact/server/service/ListUpdateService.java index 41c92e2..7cc6d91 100644 --- a/src/main/java/com/kri/contact/server/service/ListUpdateService.java +++ b/src/main/java/com/kri/contact/server/service/ListUpdateService.java @@ -13,6 +13,7 @@ import com.kri.contact.server.common.enums.ListHeaderGrade; import com.kri.contact.server.common.enums.ListHeaderType; import com.kri.contact.server.common.enums.ListIsUse; import com.kri.contact.server.common.enums.ResultCodeType; +import com.kri.contact.server.config.ListEventHistoryProperties; import com.kri.contact.server.dto.list.ListEventHistFromSurveyDto; import com.kri.contact.server.dto.list.ListEventHistInternalMetaDto; import com.kri.contact.server.dto.list.ListEventHistInsertRequestDto; @@ -36,6 +37,7 @@ import com.kri.contact.server.persistence.support.ListEventHistDeleteSupport; import com.kri.contact.server.persistence.support.ListItemDeleteSupport; import com.kri.contact.server.persistence.support.ListItemDeleteSupport.FileToDelete; import com.kri.contact.server.persistence.repository.ListEventHistRepository; +import com.kri.contact.server.persistence.repository.ListEventLatestRepository; import com.kri.contact.server.persistence.repository.ListHeaderRepository; import com.kri.contact.server.persistence.repository.ListRepository; import com.kri.contact.server.persistence.repository.ProjectSurveyRepository; @@ -51,9 +53,14 @@ import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.UUID; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.support.TransactionSynchronization; +import org.springframework.transaction.support.TransactionSynchronizationManager; @Service @RequiredArgsConstructor @@ -70,6 +77,8 @@ public class ListUpdateService { private final ListUpdateJdbcSupport listUpdateJdbcSupport; private final ListRepository listRepository; private final ListEventHistRepository listEventHistRepository; + private final ListEventLatestRepository listEventLatestRepository; + private final ListEventHistoryProperties listEventHistoryProperties; private final ListEventHistDeleteSupport listEventHistDeleteSupport; private final ListItemDeleteSupport listItemDeleteSupport; private final ProjectSurveyRepository projectSurveyRepository; @@ -78,6 +87,9 @@ public class ListUpdateService { private final ListCallHistService listCallHistService; private final ReserveService reserveService; private final ObjectMapper objectMapper; + // 같은 설문과 SID의 요청만 직렬화한다. 잠금 대기자도 참조 수에 포함해 객체가 교체되지 않게 한다. + private final ConcurrentHashMap surveyHistoryLocks = + new ConcurrentHashMap<>(); @Transactional public int updateList( @@ -195,12 +207,15 @@ public class ListUpdateService { String regUser, LocalDateTime regDt ) { + // COMPLETE가 먼저 커밋했다면 뒤따르는 START가 이를 확인할 수 있도록 조회 전에 잠근다. + lockSurveyHistoryUntilTransactionCompletion(request); + TPrjctSurveyEntity survey = validateProjectSurvey(request); validateEventHistoryTarget(survey.getPrjctIdx(), request.getSid()); applySurveySnapshot(request, survey); if (request.getAction() == ListEventHistorySurveyType.START - && listEventHistRepository.existsByPrjctIdxAndPrjctSurveyIdxAndSidAndEventTyAndResultCdNot( + && listEventLatestRepository.existsByPrjctIdxAndPrjctSurveyIdxAndSidAndEventTyAndResultCdNot( survey.getPrjctIdx(), request.getPrjctSurveyIdx(), request.getSid(), @@ -219,6 +234,67 @@ public class ListUpdateService { )); } + private void lockSurveyHistoryUntilTransactionCompletion(ListEventHistFromSurveyDto request) { + if (!TransactionSynchronizationManager.isSynchronizationActive()) { + throw new IllegalStateException("설문 이력 처리는 활성 트랜잭션 동기화가 필요합니다."); + } + + SurveyHistoryKey key = new SurveyHistoryKey(request.getPrjctSurveyIdx(), request.getSid()); + // acquire 전에 참조를 등록해야 마지막 보유자가 잠금 객체를 제거하는 경쟁을 막을 수 있다. + SurveyHistoryLock lock = surveyHistoryLocks.compute(key, (ignored, current) -> { + SurveyHistoryLock selected = current == null ? new SurveyHistoryLock() : current; + selected.users++; + return selected; + }); + + try { + // 각 요청은 같은 설문과 SID의 선행 트랜잭션을 설정된 시간까지만 기다린다. + long timeoutSeconds = listEventHistoryProperties.getSurveyLockWaitTimeoutSeconds(); + if (!lock.semaphore.tryAcquire(timeoutSeconds, TimeUnit.SECONDS)) { + releaseSurveyHistoryLockReference(key, lock); + throw new IllegalStateException("설문 이력 잠금 대기 시간이 " + timeoutSeconds + "초를 초과했습니다."); + } + } catch (InterruptedException e) { + // 허가를 얻지 못했으므로 semaphore.release() 없이 참조만 정리한다. + releaseSurveyHistoryLockReference(key, lock); + Thread.currentThread().interrupt(); + throw new IllegalStateException("설문 이력 잠금 대기 중 요청이 중단되었습니다.", e); + } + + try { + // @Transactional의 실제 커밋은 메서드 반환 후에 일어나므로 완료 콜백에서 잠금을 푼다. + TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { + @Override + public void afterCompletion(int status) { + lock.semaphore.release(); + releaseSurveyHistoryLockReference(key, lock); + } + }); + } catch (RuntimeException e) { + // 콜백 등록에 실패하면 트랜잭션 완료 시 해제할 수 없으므로 즉시 정리한다. + lock.semaphore.release(); + releaseSurveyHistoryLockReference(key, lock); + throw e; + } + } + + private void releaseSurveyHistoryLockReference(SurveyHistoryKey key, SurveyHistoryLock lock) { + // 대기자와 보유자가 모두 사라진 키만 제거해 잠금 맵이 계속 커지지 않게 한다. + surveyHistoryLocks.compute(key, (ignored, current) -> { + if (current != lock) { + throw new IllegalStateException("설문 이력 잠금 참조가 예상과 다르게 변경되었습니다."); + } + return --current.users == 0 ? null : current; + }); + } + + private record SurveyHistoryKey(Long prjctSurveyIdx, String sid) {} + + private static final class SurveyHistoryLock { + private final Semaphore semaphore = new Semaphore(1, true); + private int users; + } + private void validateListUpdateRequest(ListUpdateRequestDto request){ if( CollectionUtil.isEmpty(request.getUpdateContents()) && diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index fba8704..98136da 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -82,6 +82,9 @@ kri: cleanup-expire-months: 3 cleanup-cron: "0 30 0 * * SUN" + list-event-history: + survey-lock-wait-timeout-seconds: 30 + web: enabled: true # 공통 Web 구성 사용 여부 (기본 true) redis: