Merge pull request #70 from prgrms-web-devcourse-final-project/feature/cluster-marker-lock-retry

지도 클러스터/마커형 조회 기능 Redis 분산락 & Retry 적용

Author: dnzp75

.github/workflows/dev-build.yml

@@ -35,29 +35,13 @@ jobs:
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
 
-#      - name: S3에서 init.sql 다운로드
-#        env:
-#          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-#          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-#          AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
-#        run: |
-#          mkdir -p docker
-#          aws s3 cp s3://devcos4-team08-bucket/db/init.sql ./docker/init.sql
-
-
       - name: Docker Compose 설치
         run: |
           sudo curl -L "https://github.com/docker/compose/releases/download/v2.17.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
           sudo chmod +x /usr/local/bin/docker-compose
 
-      - name: CI용 빈 init.sql 생성
-        run: |
-          mkdir -p docker
-          touch docker/init.sql
-
       - name: Docker Compose 실행
         run: |
-          chmod -R 755 ./docker
           docker-compose -f docker-compose.yml up -d
 
       - name: 컨테이너 실행 대기
@@ -117,7 +101,7 @@ jobs:
         run: |
           chmod +x ./gradlew
           # 소나클라우드 임시 비활성화 ./gradlew build jacocoTestReport sonar --info -Pprofile=dev -Dsonar.branch.name=${{ github.ref_name }}
-          ./gradlew build -i jacocoTestReport -Pprofile=dev 
+          ./gradlew build -i jacocoTestReport -Pprofile=test 
 
 
       - name: Docker Compose 종료

docker-compose.yml

@@ -10,7 +10,6 @@ services:
       - "5432:5432"
     volumes:
       - pgdata:/var/lib/postgresql/data
-      - ./docker/init.sql:/docker-entrypoint-initdb.d/init.sql
     networks:
       - log4u-net
 

src/main/java/com/example/log4u/common/config/PostgreSqlConfig.java

@@ -44,7 +44,7 @@ public LocalContainerEntityManagerFactoryBean postgresqlEntityManagerFactory() {
 
 		Map<String, Object> properties = new HashMap<>();
 		properties.put("hibernate.dialect", "org.hibernate.dialect.PostgreSQLDialect");
-		properties.put("hibernate.hbm2ddl.auto", "none");
+		properties.put("hibernate.hbm2ddl.auto", "update");
 		properties.put("hibernate.format_sql", true);
 		em.setJpaPropertyMap(properties);
 

src/main/java/com/example/log4u/common/config/S3Config.java

@@ -13,13 +13,13 @@
 @Configuration
 public class S3Config {
 
-	@Value("${AWS_ACCESS_KEY_ID}")
+	@Value("${spring.aws.access-key-id}")
 	private String accessKey;
 
-	@Value("${AWS_SECRET_ACCESS_KEY}")
+	@Value("${spring.aws.secret-access-key}")
 	private String secretKey;
 
-	@Value("${AWS_REGION:ap-northeast-2}")
+	@Value("${spring.aws.region:ap-northeast-2}")
 	private String region;
 
 	@Bean

src/main/java/com/example/log4u/common/executor/DistributedLockExecutor.java

@@ -0,0 +1,31 @@
+package com.example.log4u.common.executor;
+
+import java.util.function.Supplier;
+
+import org.springframework.stereotype.Component;
+
+import com.example.log4u.common.infra.cache.CacheManager;
+
+import lombok.RequiredArgsConstructor;
+
+@Component
+@RequiredArgsConstructor
+public class DistributedLockExecutor {
+
+    private final CacheManager cacheManager;
+
+    public void runWithLock(String lockKey, Runnable task) {
+        runWithLock(lockKey, () -> task);
+    }
+
+    public <T> T runWithLock(String lockKey, Supplier<T> task) {
+        if (!cacheManager.tryLock(lockKey)) {
+            return null;
+        }
+        try {
+            return task.get();
+        } finally {
+            cacheManager.releaseLock(lockKey);
+        }
+    }
+}

src/main/java/com/example/log4u/common/executor/RetryExecutor.java

@@ -0,0 +1,39 @@
+package com.example.log4u.common.executor;
+
+import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
+
+import org.springframework.stereotype.Component;
+
+import com.example.log4u.domain.map.exception.MaxRetryExceededException;
+
+@Component
+public class RetryExecutor {
+
+    int MAX_RETRY_CNT = 10;
+    int INITIAL_DELAY_MSEC = 1_000;
+    int MAX_DELAY_MSEC = 100_000;
+
+    public <T> T runWithRetry(Supplier<T> task) {
+        for (int attempt = 0; attempt < MAX_RETRY_CNT; attempt++) {
+            T result = task.get();
+            if (result != null) {
+                return result;
+            }
+            backoff(attempt);
+        }
+        throw new MaxRetryExceededException();
+    }
+
+    private void backoff(int attempt) {
+        try {
+            int delay = Math.min(
+                    INITIAL_DELAY_MSEC * (int) Math.pow(2, attempt - 1),
+                    MAX_DELAY_MSEC);
+
+            TimeUnit.MILLISECONDS.sleep(delay);
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+        }
+    }
+}

src/main/java/com/example/log4u/common/infra/cache/CacheManager.java

@@ -4,9 +4,15 @@
 
 public interface CacheManager {
 
-    void cache(String key, String value, Duration ttl);
+	void init();
+
+	void cache(String key, String value, Duration ttl);
 
     String get(String key);
 
     void evict(String key);
+
+	Boolean tryLock(String key);
+
+	void releaseLock(String key);
 }

src/main/java/com/example/log4u/common/infra/cache/RedisCacheManagerImpl.java

@@ -14,7 +14,14 @@
 @RequiredArgsConstructor
 public class RedisCacheManagerImpl implements CacheManager {
 
-    private final RedisTemplate<String, String> redisTemplate;
+	private static final String LOCK_VALUE = "locked";
+
+	private final RedisTemplate<String, String> redisTemplate;
+
+	public void init() {
+		Objects.requireNonNull(redisTemplate.getConnectionFactory())
+			.getConnection().flushAll();
+	}
 
     public void cache(String key, String value, Duration ttl) {
         redisTemplate.opsForValue().set(key, value, ttl);
@@ -27,4 +34,12 @@ public String get(String key) {
     public void evict(String key) {
         redisTemplate.delete(key);
     }
+
+	public Boolean tryLock(String key) {
+		return redisTemplate.opsForValue().setIfAbsent(key, LOCK_VALUE);
+	}
+
+	public void releaseLock(String key) {
+		redisTemplate.delete(key);
+	}
 }

src/main/java/com/example/log4u/domain/map/cache/CacheKeyGenerator.java

@@ -6,8 +6,8 @@
 
 import org.springframework.stereotype.Component;
 
+import com.example.log4u.common.executor.DistributedLockExecutor;
 import com.example.log4u.common.infra.cache.CacheManager;
-import com.example.log4u.domain.map.cache.CacheKeyGenerator;
 import com.example.log4u.domain.map.cache.RedisTTLPolicy;
 import com.example.log4u.domain.map.dto.response.DiaryClusterResponseDto;
 import com.example.log4u.domain.map.exception.InvalidMapLevelException;
@@ -23,13 +23,19 @@
 @Slf4j
 public class ClusterCacheDao {
 
+	private static final String CLUSTER_CACHE_KEY = "cluster:geohash:%s:level:%d";
+	public static final String CLUSTER_LOCK_KEY = "cluster-lock";
+
 	private final CacheManager cacheManager;
 
+	private final DistributedLockExecutor distributedLockExecutor;
+
 	private final SidoAreasRepository sidoAreasRepository;
 	private final SiggAreasRepository siggAreasRepository;
 
 	public List<DiaryClusterResponseDto> load(String geohash, int level) {
-		String value = cacheManager.get(CacheKeyGenerator.clusterCacheKey(geohash, level));
+		String key = String.format(CLUSTER_CACHE_KEY, geohash, level);
+		String value = cacheManager.get(key);
 		if (value == null) {
 			return null;
 		}
@@ -42,9 +48,11 @@ private List<DiaryClusterResponseDto> convertToClusters(String value) {
 	}
 
 	public List<DiaryClusterResponseDto> loadAndCache(String geohash, int level) {
-		List<DiaryClusterResponseDto> clusters = loadClustersFromDb(geohash, level);
-		cache(clusters, geohash, level);
-		return clusters;
+		return distributedLockExecutor.runWithLock(CLUSTER_LOCK_KEY, () -> {
+			List<DiaryClusterResponseDto> clusters = loadClustersFromDb(geohash, level);
+			cache(clusters, geohash, level);
+			return clusters;
+		});
 	}
 
 	private List<DiaryClusterResponseDto> loadClustersFromDb(String geohash, int level) {
@@ -56,17 +64,17 @@ private List<DiaryClusterResponseDto> loadClustersFromDb(String geohash, int lev
 	}
 
 	private void cache(List<DiaryClusterResponseDto> clusters, String geohash, int level) {
-		String key = CacheKeyGenerator.clusterCacheKey(geohash, level);
+		String key = String.format(CLUSTER_CACHE_KEY, geohash, level);
 		cacheManager.cache(key, writeValueAsString(clusters), RedisTTLPolicy.CLUSTER_TTL);
 	}
 
 	public void evictSido(String geohash) {
-		String key = CacheKeyGenerator.clusterCacheKey(geohash, 1);
+		String key = String.format(CLUSTER_CACHE_KEY, geohash, 1);
 		cacheManager.evict(key);
 	}
 
 	public void evictSigg(String geohash) {
-		String key = CacheKeyGenerator.clusterCacheKey(geohash, 2);
+		String key = String.format(CLUSTER_CACHE_KEY, geohash, 2);
 		cacheManager.evict(key);
 	}