배치잡 CLUSTERED 기능 추가

.gitea/workflows/eapim-admin-ci.yml

@@ -17,7 +17,7 @@ jobs:
       CATALINA_BASE: /prod/eapim/adminportal
       CATALINA_HOME: /prod/eapim/apache-tomcat-9.0.116
       CATALINA_PID: /prod/eapim/adminportal/temp/catalina.pid
-      DEPLOY_HTTP_PORT: "39120"
+      DEPLOY_HTTP_PORT: "30120"
     defaults:
       run:
         working-directory: eapim-admin
@@ -89,7 +89,7 @@ jobs:
           cp eapim-admin/build/libs/eapim-admin.war "$DEPLOY_DIR/monitoring.war"
           ls -la "$DEPLOY_DIR"
 
-      - name: Start tomcat and readiness probe (timeout 300s)
+      - name: Start tomcat and readiness probe (timeout 180s)
         working-directory: ${{ github.workspace }}
         run: |
           LOG="$CATALINA_BASE/logs/catalina.$(date +%Y-%m-%d).log"
@@ -99,17 +99,14 @@ jobs:
           # systemd 가 Tomcat 을 새 cgroup 으로 띄움 — runner step 종료와 무관하게 살아남음
           systemctl --user start eapim-admin
 
-          # /loginForm.do 는 GET 매핑(MainController#loginForm) → tomcat·webapp 양쪽 살아있으면 200
-          # /login.do 는 POST 처리 — GET 으로 probe 시 405/잘못된 응답 가능성 있어 회피
-          PROBE_URL="http://localhost:$DEPLOY_HTTP_PORT/monitoring/loginForm.do"
-          DEADLINE=$(($(date +%s) + 300))
+          DEADLINE=$(($(date +%s) + 180))
           STATUS=000
           while [ $(date +%s) -lt $DEADLINE ]; do
             STATUS=$(curl -sS -o /dev/null -w '%{http_code}' --max-time 3 \
-                     "$PROBE_URL" 2>/dev/null || echo "000")
+                     "http://localhost:$DEPLOY_HTTP_PORT/monitoring/login.do" 2>/dev/null || echo "000")
             case "$STATUS" in
               200|302|401)
-                echo "Readiness OK ($PROBE_URL HTTP $STATUS)"
+                echo "Readiness OK (/monitoring/login.do HTTP $STATUS)"
                 break
                 ;;
             esac
@@ -125,13 +122,8 @@ jobs:
           case "$STATUS" in
             200|302|401) ;;
             *)
-              echo "::error::Readiness probe failed within 300s (last HTTP status: $STATUS)"
-              echo "--- last 300 lines of catalina log ---"
-              [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -300
-              echo "--- systemd unit status ---"
-              systemctl --user status eapim-admin --no-pager || true
-              echo "--- listening ports ---"
-              ss -tlnp 2>/dev/null | grep -E ":$DEPLOY_HTTP_PORT\b" || echo "(port $DEPLOY_HTTP_PORT 미점유)"
+              echo "::error::Readiness probe failed within 180s (last HTTP status: $STATUS)"
+              [ -f "$LOG" ] && tail -c +$((BEFORE+1)) "$LOG" | tail -100
               exit 1
               ;;
           esac

src/main/java/com/eactive/eai/rms/ext/djb/apistatus/ApiStatusRepository.java

@@ -39,11 +39,10 @@ public interface ApiStatusRepository extends BaseRepository<ApiStatus, String> {
 	  + "   FROM ("
 	  + "     SELECT A.EAISVCNAME"
 	  + "          , NVL(B.STATUS_CODE, 'N') AS STATUS_CODE"
-	  //TODO: 게시판 임시로 생성하여 사용. 유차장이 완료하면 변경할것
-	  + "          , NVL(( SELECT 'Y' FROM PTL_NOTICE_API X "
-	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.PTL_NOTICE Y WHERE X.NOTICE_ID = Y.ID)"
-	  //+ "                     AND TO_CHAR(SYSDATE, 'YYYYMMDDHH24MI') BETWEEN START_TIME AND END_TIME) "
-	  + "                     AND A.EAISVCNAME = X.API_NAME),'N') AS CTRL_YN "
+	  + "          , NVL(( SELECT MAX('Y') FROM EMSAPP.DJB_APISTATUS_INCIDENT_API X"
+	  + "                   WHERE EXISTS (SELECT 1 FROM EMSAPP.DJB_APISTATUS_INCIDENT Y WHERE X.INCIDENT_ID = Y.INCIDENT_ID "
+	  + "        	                       AND SYSTIMESTAMP BETWEEN STARTED_AT AND END_AT) "
+	  + "                     AND A.EAISVCNAME = X.API_ID),'N') AS CTRL_YN "
 	  + "          , (SELECT CASE WHEN TOTAL = 0 THEN 'X'"
 	  + "                         WHEN (TOTAL - SUCCESS) * 100 / TOTAL > :errorRate THEN 'Y'"
 	  + "                    ELSE 'N' END"

src/main/java/com/eactive/eai/rms/ext/djb/job/ApiStatusMonitorJob.java

@@ -1,6 +1,9 @@
 package com.eactive.eai.rms.ext.djb.job;
 
+import java.util.Arrays;
 import java.util.HashMap;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
 import org.quartz.DisallowConcurrentExecution;
@@ -68,10 +71,24 @@ public class ApiStatusMonitorJob implements Job {
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
+        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+
+        // execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
+        String allowedInstances = jobDataMap.getString("execute.instances");
+        if (StringUtils.isNotEmpty(allowedInstances)) {
+            Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
+                    .map(s -> s.trim().toLowerCase())
+                    .collect(Collectors.toSet());
+            String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
+            if (!instanceSet.contains(currentInstance)) {
+                log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
+                return;
+            }
+        }
+
         log.info("*** START ApiStatusUpdateJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
 
         // Job 파라미터 로깅
-        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
         logJobParameters(jobDataMap);
         
         HashMap<String, String> param = this.checkParameters(jobDataMap);

src/main/java/com/eactive/eai/rms/ext/djb/job/InflowTokenMonitorJob.java

@@ -1,8 +1,12 @@
 package com.eactive.eai.rms.ext.djb.job;
 
+import java.util.Arrays;
 import java.util.Date;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
 import org.quartz.JobDataMap;
@@ -48,6 +52,21 @@ public class InflowTokenMonitorJob implements Job {
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
+        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+
+        // execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
+        String allowedInstances = jobDataMap.getString("execute.instances");
+        if (StringUtils.isNotEmpty(allowedInstances)) {
+            Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
+                    .map(s -> s.trim().toLowerCase())
+                    .collect(Collectors.toSet());
+            String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
+            if (!instanceSet.contains(currentInstance)) {
+                log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
+                return;
+            }
+        }
+
         log.info("*** START InflowTokenFailMonitorJob run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
 
         long execMinute = 1;	//default 배치 실행주기(분)

src/main/java/com/eactive/eai/rms/ext/djb/job/PortalInquiryClosingJob.java

@@ -5,14 +5,20 @@ import com.eactive.eai.rms.common.datasource.DataSourceTypeManager;
 import com.eactive.eai.rms.common.util.CommonUtil;
 import com.eactive.eai.rms.onl.apim.portalInquiry.PortalInquiryClosingService;
 import com.eactive.eai.rms.onl.common.util.DateUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
+import org.quartz.JobDataMap;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.util.Arrays;
+import java.util.Set;
+import java.util.stream.Collectors;
+
 /**
  * 매일 00:05 실행 - RESPONDED 상태 문의글 자동 종료 배치
  *
@@ -44,6 +50,21 @@ public class PortalInquiryClosingJob implements Job {
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
+        JobDataMap jobDataMap = context.getJobDetail().getJobDataMap();
+
+        // execute.instances 가 지정된 경우 해당 인스턴스에서만 실행
+        String allowedInstances = jobDataMap.getString("execute.instances");
+        if (StringUtils.isNotEmpty(allowedInstances)) {
+            Set<String> instanceSet = Arrays.stream(allowedInstances.split(","))
+                    .map(s -> s.trim().toLowerCase())
+                    .collect(Collectors.toSet());
+            String currentInstance = StringUtils.defaultString(System.getProperty("inst.Name")).trim().toLowerCase();
+            if (!instanceSet.contains(currentInstance)) {
+                log.debug("Job 실행 인스턴스 제한 - 현재: {}, 허용: {}", currentInstance, allowedInstances);
+                return;
+            }
+        }
+
         log.info("*** START PortalInquiryCommentClosingService run({})", CommonUtil.getToday("yyyy-MM-dd HH:mm"));
 
         int closingDays = DEFAULT_CLOSING_DAYS;