From db24069faaf3d9bb43e0e4b00bb146af6ea2e0ef Mon Sep 17 00:00:00 2001
From: renkaige <renkaige@iie.ac.cn>
Date: Wed, 13 Feb 2019 16:16:41 +0800
Subject: 
 1:修改实时统计配置向集群同步时没有将哨兵的连接关闭导致资源被占满的问题
 2:修改从redis获取自增长值时可能存在的redis连接未关闭的情况
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/util/JedisUtils.java         | 14 ++++-
 .../java/com/nis/web/task/SyncRedisToCluster.java  | 64 +++++++++++++---------
 2 files changed, 48 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/nis/util/JedisUtils.java b/src/main/java/com/nis/util/JedisUtils.java
index 86f59fe..5957dfc 100644
--- a/src/main/java/com/nis/util/JedisUtils.java
+++ b/src/main/java/com/nis/util/JedisUtils.java
@@ -76,9 +76,17 @@ public class JedisUtils {
 	 * @return long 相加后的值
 	 */
 	public static long incrBy(String key, long number, int redisDb) {
-		Jedis jedis = getResource(redisDb);
-		long len = jedis.incrBy(key, number);
-		returnResource(jedis);
+		Jedis jedis = null;
+		long len = 0l;
+		try {
+			jedis = getResource(redisDb);
+			len = jedis.incrBy(key, number);
+		} catch (Exception e) {
+			throw new ServiceRuntimeException("从" + redisDb + "号redisDB中获取自增值" + key + "失败",
+					RestBusinessCode.KeyNotExistsInRedis.getValue());
+		} finally {
+			returnResource(jedis);
+		}
 		return len;
 	}
 
diff --git a/src/main/java/com/nis/web/task/SyncRedisToCluster.java b/src/main/java/com/nis/web/task/SyncRedisToCluster.java
index 7fa4a1d..da0146d 100644
--- a/src/main/java/com/nis/web/task/SyncRedisToCluster.java
+++ b/src/main/java/com/nis/web/task/SyncRedisToCluster.java
@@ -71,9 +71,9 @@ public class SyncRedisToCluster {
 			}
 		}
 	}
-
+	
 //	@Scheduled(cron = "${syncRedisToClusterCron}")
-	public void syncRedisToCluster() {
+	public void syncRedisToCluster1() {
 		JedisCluster jedisCluster = getResource();
 		String requestId = UUID.randomUUID().toString();
 		try {
@@ -207,35 +207,45 @@ public class SyncRedisToCluster {
 	}
 
 	public void syncData(JedisCluster jedisCluster, Double min, Double max, String verionStr) {
-		Jedis resource = JedisUtils.getResource(redisStatisticsRealDBIndex);
-		Set<Tuple> zrangeByScoreWithScores = null;
-		if (min == null && max == null) {
-			int version = Integer.parseInt(verionStr);
-			int maxVersion = 1000;
-			int count = version / maxVersion;
-			if ((version % maxVersion) != 0) {
-				count++;
-			}
-			min = 0D;
-			for (int i = 0; i < count; i++) {
-				int start = i * maxVersion + 1;
-				int end = (i + 1) * maxVersion;
-				if (end > version) {
-					end = version;
+		Jedis resource = null;
+		try {
+			resource = JedisUtils.getResource(redisStatisticsRealDBIndex);
+			Set<Tuple> zrangeByScoreWithScores = null;
+			if (min == null && max == null) {
+				int version = Integer.parseInt(verionStr);
+				int maxVersion = 1000;
+				int count = version / maxVersion;
+				if ((version % maxVersion) != 0) {
+					count++;
+				}
+				min = 0D;
+				for (int i = 0; i < count; i++) {
+					int start = i * maxVersion + 1;
+					int end = (i + 1) * maxVersion;
+					if (end > version) {
+						end = version;
+					}
+					min = Double.parseDouble(start + "");
+					max = Double.parseDouble(end + "");
+					// 分批获取,避免一次性获取太多,造成redis阻塞
+					zrangeByScoreWithScores = resource.zrangeByScoreWithScores("MAAT_UPDATE_STATUS", min, max);// 获取所有的maat_update_status
+					syncData(jedisCluster, zrangeByScoreWithScores);
 				}
-				min = Double.parseDouble(start + "");
-				max = Double.parseDouble(end + "");
-				// 分批获取,避免一次性获取太多,造成redis阻塞
-				zrangeByScoreWithScores = resource.zrangeByScoreWithScores("MAAT_UPDATE_STATUS", min, max);// 获取所有的maat_update_status
+			} else {
+				zrangeByScoreWithScores = resource.zrangeByScoreWithScores("MAAT_UPDATE_STATUS", min, max);// 获取增量的数据
 				syncData(jedisCluster, zrangeByScoreWithScores);
 			}
-		} else {
-			zrangeByScoreWithScores = resource.zrangeByScoreWithScores("MAAT_UPDATE_STATUS", min, max);// 获取增量的数据
-			syncData(jedisCluster, zrangeByScoreWithScores);
+			jedisCluster.set("MAAT_VERSION", verionStr);
+			logger.info("更新了redis集群中的MAAT_VERSION,更新后值是{}", verionStr);
+			logger.info("向redis集群同步数据成功");
+		} catch (Exception e) {
+			throw new ServiceRuntimeException("从" + redisStatisticsRealDBIndex + "号redisDB中获取实时统计数据失败",
+					RestBusinessCode.ExistsKeyFailed.getValue());
+		} finally {
+			if (resource != null) {
+				resource.close();
+			}
 		}
-		jedisCluster.set("MAAT_VERSION", verionStr);
-		logger.info("更新了redis集群中的MAAT_VERSION,更新后值是{}", verionStr);
-		logger.info("向redis集群同步数据成功");
 	}
 
 	private void syncData(JedisCluster jedisCluster, Set<Tuple> zrangeByScoreWithScores) {
-- 
cgit v1.2.3