Merge pull request #22 from CarToi/dev

[Refactor/embedding qpm] 스레드 비동기 동작 로그 확인

Author: kimD0ngjun

src/main/java/org/jun/saemangeum/consume/controller/SurveyController.java

@@ -1,6 +1,7 @@
 package org.jun.saemangeum.consume.controller;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.jun.saemangeum.consume.domain.dto.RecommendationResponse;
 import org.jun.saemangeum.consume.domain.dto.SurveyCreateRequest;
 import org.jun.saemangeum.consume.domain.dto.SurveyUpdateRequest;
@@ -9,6 +10,7 @@
 
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("/api/survey")
 @RequiredArgsConstructor
@@ -21,6 +23,7 @@ public class SurveyController {
      */
     @PostMapping("/recommendation")
     public List<RecommendationResponse> createSurvey(@RequestBody SurveyCreateRequest request) {
+        log.info("{} - 데이터 소비 요청응답", Thread.currentThread().getName());
         return surveyRecommendationService.createRecommendationsBySurvey(request);
     }
 
@@ -29,6 +32,7 @@ public List<RecommendationResponse> createSurvey(@RequestBody SurveyCreateReques
      */
     @PatchMapping("/update")
     public void updateSurvey(@RequestBody SurveyUpdateRequest request) {
+        log.info("{} - 데이터 소비 업데이트", Thread.currentThread().getName());
         surveyRecommendationService.updateSurvey(request);
     }
 }

src/main/java/org/jun/saemangeum/consume/service/strategy/TableEmbeddingVectorStrategy.java

@@ -37,7 +37,7 @@ public List<? extends IContent> calculateSimilarity(String text) {
 
             TableEmbeddingVectorStrategy.ContentSimilarity cs =
                     new TableEmbeddingVectorStrategy.ContentSimilarity(vec.getContent(), similarity);
-            if (pq.size() < 10) {
+            if (pq.size() < 18) {
                 pq.offer(cs);
             } else if (similarity > pq.peek().similarity) {
                 pq.poll();

src/main/java/org/jun/saemangeum/consume/service/strategy/ViewEmbeddingVectorStrategy.java

@@ -37,7 +37,7 @@ public List<? extends IContent> calculateSimilarity(String text) {
 
             ViewEmbeddingVectorStrategy.ContentSimilarity cs =
                     new ViewEmbeddingVectorStrategy.ContentSimilarity(vec.getContentView(), similarity);
-            if (pq.size() < 10) {
+            if (pq.size() < 18) {
                 pq.offer(cs);
             } else if (similarity > pq.peek().similarity) {
                 pq.poll();

src/main/java/org/jun/saemangeum/global/config/Initializer.java

@@ -36,6 +36,5 @@ public void setEmbeddingStrategy() {
         // 전략 초기화
         log.info("테이블 기반 임베딩 벡터 조회 전략 처리");
         StrategyContextHolder.setStrategy(tableEmbeddingVectorStrategy);
-//        surveyRecommendationService.setEmbeddingVectorStrategy(tableEmbeddingVectorStrategy);
     }
 }

src/main/java/org/jun/saemangeum/pipeline/application/schedule/PipelineScheduler.java

@@ -3,7 +3,6 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.jun.saemangeum.consume.service.application.SurveyRecommendationService;
 import org.jun.saemangeum.consume.service.strategy.StrategyContextHolder;
 import org.jun.saemangeum.consume.service.strategy.TableEmbeddingVectorStrategy;
 import org.jun.saemangeum.consume.service.strategy.ViewEmbeddingVectorStrategy;
@@ -19,18 +18,17 @@ public class PipelineScheduler {
 
     private final PipelineService pipelineService;
     private final ViewJdbcUtil viewJdbcUtil;
-    private final SurveyRecommendationService surveyRecommendationService;
     private final TableEmbeddingVectorStrategy tableEmbeddingVectorStrategy;
     private final ViewEmbeddingVectorStrategy viewEmbeddingVectorStrategy;
 
-//    @Scheduled(cron = "0 0 3 ? * SUN") // 얘 자체가 애시당초 다른 스레드 풀에서 돌아가게 처리
+    @Scheduled(cron = "0 0 3 ? * SUN") // 얘 자체가 애시당초 다른 스레드 풀에서 돌아가게 처리
     public void process() {
         try {
+            log.info("{} - 파이프라인 프로세스 시작", Thread.currentThread().getName());
             log.info("[스케줄러] 스왑 뷰 추가");
             viewJdbcUtil.createViews();
 
             log.info("[스케줄러] DB 조회 무중단 처리, 임베딩 벡터 조회 스왑 뷰 전략 교체");
-//            surveyRecommendationService.setEmbeddingVectorStrategy(viewEmbeddingVectorStrategy);
             StrategyContextHolder.setStrategy(viewEmbeddingVectorStrategy);
 
             log.info("[스케줄러] 데이터 파이프라인 프로세스 시작");
@@ -40,7 +38,6 @@ public void process() {
             log.error("[스케줄러] 파이프라인 중 {} 예외 발생", e.getClass().getSimpleName(), e);
         } finally {
             log.info("[스케줄러] 임베딩 벡터 조회 전략 테이블 복귀 처리");
-//            surveyRecommendationService.setEmbeddingVectorStrategy(tableEmbeddingVectorStrategy);
             StrategyContextHolder.setStrategy(tableEmbeddingVectorStrategy);
 
             log.info("[스케줄러] 스왑 뷰 삭제");

src/main/java/org/jun/saemangeum/pipeline/infrastructure/queue/EmbeddingWorker.java

@@ -26,6 +26,7 @@ public EmbeddingWorker(EmbeddingJobQueue queue, EmbeddingVectorService service)
 
     @Override
     public void run() {
+        log.info("{} - 임베딩 벡터 작업(재시도 포함)", Thread.currentThread().getName());
         while (true) {
             try {
                 EmbeddingJob job = queue.pollQueue();

src/test/java/org/jun/saemangeum/service/StrategyConcurrencyTest.java

@@ -129,8 +129,8 @@ void testStrategyThreadUnsafe() throws InterruptedException {
 
                 List<RecommendationResponse> responses =
                         mockSurveyRecommendationService.createRecommendationsBySurvey(request);
-                observedTitles.add(responses.get(0).title());
-                log.info("[데이터 소비 3티어] 사용된 추천 제목(전략): {}", responses.get(0).title());
+                observedTitles.add(responses.getFirst().title());
+                log.info("[데이터 소비 3티어] 사용된 추천 제목(전략): {}", responses.getFirst().title());
             } catch (InterruptedException e) {
                 log.error("스레드 인터럽트 발생");
             } finally
@@ -142,7 +142,7 @@ void testStrategyThreadUnsafe() throws InterruptedException {
         latch.await();
         executor.shutdown();
 
-        String usedTitle = observedTitles.get(0);
+        String usedTitle = observedTitles.getFirst();
         log.info("최종 추천(조회 전략): {}", usedTitle);
 
         // 1번 실행기에서 전략이 스왑 뷰로 바뀌면 그 전략을 2번 실행기에서 따라가야 한다.