♻️ redisson 적용

Author: sehee123

backend/src/main/java/io/f1/backend/domain/game/app/RoomService.java

@@ -39,16 +39,16 @@ public void initializeRoomSocket(@DestinationVariable Long roomId, Message<?> me
     public void reconnect(@DestinationVariable Long roomId, Message<?> message) {
 
         UserPrincipal principal = getSessionUser(message);
-        roomService.changeConnectedStatus(roomId, principal.getUserId(), ConnectionState.CONNECTED);
-        roomService.reconnectSendResponse(roomId, principal);
+        roomService.changeConnectedStatusWithLock(roomId, principal.getUserId(), ConnectionState.CONNECTED);
+        roomService.reconnectSendResponseWithLock(roomId, principal);
     }
 
     @MessageMapping("/room/exit/{roomId}")
     public void exitRoom(@DestinationVariable Long roomId, Message<?> message) {
 
         UserPrincipal principal = getSessionUser(message);
 
-        roomService.exitRoom(roomId, principal);
+        roomService.exitRoomWithLock(roomId, principal);
     }
 
     @MessageMapping("/room/start/{roomId}")

backend/src/main/java/io/f1/backend/domain/game/websocket/controller/GameSocketController.java

@@ -1,5 +1,7 @@
 package io.f1.backend.domain.game.websocket.eventlistener;
 
+import static io.f1.backend.domain.game.app.RoomService.ROOM_LOCK_PREFIX;
+import static io.f1.backend.domain.game.app.RoomService.USER_LOCK_PREFIX;
 import static io.f1.backend.domain.game.websocket.WebSocketUtils.getSessionUser;
 
 import io.f1.backend.domain.game.app.RoomService;
@@ -8,6 +10,7 @@
 import io.f1.backend.domain.game.websocket.HeartbeatMonitor;
 import io.f1.backend.domain.user.dto.UserPrincipal;
 
+import io.f1.backend.global.lock.LockExecutor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 
@@ -24,6 +27,7 @@ public class WebsocketEventListener {
     private final RoomService roomService;
     private final DisconnectTaskManager taskManager;
     private final HeartbeatMonitor heartbeatMonitor;
+    private final LockExecutor lockExecutor;
 
     @EventListener
     public void handleDisconnectedListener(SessionDisconnectEvent event) {
@@ -41,17 +45,24 @@ public void handleDisconnectedListener(SessionDisconnectEvent event) {
             return;
         }
 
-        Long roomId = roomService.getRoomIdByUserId(userId);
+        Long roomId = lockExecutor.executeWithLock(USER_LOCK_PREFIX, userId,
+            () -> roomService.getRoomIdByUserId(userId));
 
-        roomService.changeConnectedStatus(roomId, userId, ConnectionState.DISCONNECTED);
+        lockExecutor.executeWithLock(
+            ROOM_LOCK_PREFIX, roomId, () -> roomService.changeConnectedStatus(roomId, userId,
+                ConnectionState.DISCONNECTED));
 
         taskManager.scheduleDisconnectTask(
-                userId,
-                () -> {
-                    if (ConnectionState.DISCONNECTED.equals(
+            userId,
+            () -> {
+                lockExecutor.executeWithLock(ROOM_LOCK_PREFIX, roomId,
+                    () -> {
+                        if (ConnectionState.DISCONNECTED.equals(
                             roomService.getPlayerState(userId, roomId))) {
-                        roomService.disconnectOrExitRoom(roomId, principal);
+                            roomService.disconnectOrExitRoom(roomId, principal);
+                        }
                     }
-                });
+                );
+            });
     }
 }

backend/src/main/java/io/f1/backend/domain/game/websocket/eventlistener/WebsocketEventListener.java

@@ -13,7 +13,9 @@ public enum CommonErrorCode implements ErrorCode {
     INTERNAL_SERVER_ERROR(
             "E500001", HttpStatus.INTERNAL_SERVER_ERROR, "서버에러가 발생했습니다. 관리자에게 문의해주세요."),
     INVALID_JSON_FORMAT("E400008", HttpStatus.BAD_REQUEST, "요청 형식이 올바르지 않습니다. JSON 문법을 확인해주세요."),
-    LOCK_ACQUISITION_FAILED("E409003", HttpStatus.CONFLICT, "다른 요청이 작업 중입니다. 잠시 후 다시 시도해주세요.");
+    LOCK_ACQUISITION_FAILED("E409003", HttpStatus.CONFLICT, "다른 요청이 작업 중입니다. 잠시 후 다시 시도해주세요."),
+    LOCK_INTERRUPTED("E500004", HttpStatus.INTERNAL_SERVER_ERROR, "작업 중 락 획득이 중단되었습니다. 다시 시도해주세요.");
+
 
     private final String code;
 

backend/src/main/java/io/f1/backend/global/exception/errorcode/CommonErrorCode.java

@@ -20,7 +20,7 @@
 @RequiredArgsConstructor
 public class DistributedLockAspect {
 
-    private static final String LOCK_KEY_FORMAT = "lock:%s:{%s}";
+    public static final String LOCK_KEY_FORMAT = "lock:%s:{%s}";
 
     private final RedissonClient redissonClient;
 

backend/src/main/java/io/f1/backend/global/lock/DistributedLockAspect.java

@@ -0,0 +1,68 @@
+package io.f1.backend.global.lock;
+
+import static io.f1.backend.global.lock.DistributedLockAspect.LOCK_KEY_FORMAT;
+
+import io.f1.backend.global.exception.CustomException;
+import io.f1.backend.global.exception.errorcode.CommonErrorCode;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.redisson.api.RLock;
+import org.redisson.api.RedissonClient;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class LockExecutor {
+
+    private final RedissonClient redissonClient;
+
+    // 시간단위를 초로 변경
+    private static final TimeUnit DEFAULT_TIME_UNIT = TimeUnit.SECONDS;
+
+    // 락 점유를 위한 대기 시간
+    private static final long DEFAULT_WAIT_TIME = 5L;
+
+    // 락 점유 시간
+    private static final long DEFAULT_LEASE_TIME = 3L;
+
+    public <T> T executeWithLock(String prefix, Object key, Supplier<T> supplier) {
+        String lockKey = formatLockKey(prefix, key);
+        RLock rlock = redissonClient.getLock(lockKey);
+
+        boolean acquired = false;
+        try {
+            acquired = rlock.tryLock(DEFAULT_WAIT_TIME, DEFAULT_LEASE_TIME, DEFAULT_TIME_UNIT);
+
+            if(!acquired) {
+                log.warn("[DistributedLock] Lock acquisition failed: {}", key);
+                throw new CustomException(CommonErrorCode.LOCK_ACQUISITION_FAILED);
+            }
+            log.info("[DistributedLock] Lock acquired: {}", key);
+
+            return supplier.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new CustomException(CommonErrorCode.LOCK_INTERRUPTED);
+        } finally {
+            if (acquired && rlock.isHeldByCurrentThread()) {
+                rlock.unlock();
+                log.info("[DistributedLock] Lock released: {}", key);
+            }
+        }
+    }
+
+    public void executeWithLock(String prefix, Object key, Runnable runnable) {
+        executeWithLock(prefix, key, () -> {
+            runnable.run();
+            return null;
+        });
+    }
+
+
+    private String formatLockKey(String prefix, Object value) {
+        return String.format(LOCK_KEY_FORMAT, prefix, value);
+    }
+}

backend/src/main/java/io/f1/backend/global/lock/LockExecutor.java

@@ -222,7 +222,7 @@ static class TestRoomService extends RoomService {
         private final Map<Long, Room> rooms = new ConcurrentHashMap<>();
 
         public TestRoomService() {
-            super(null, null, null, null, null, null);
+            super(null, null, null, null, null, null,null);
         }
 
         @Override