From 54f29c5054b6142a303ceeb6675d6de7ccae4eb4 Mon Sep 17 00:00:00 2001
From: fuderong <2402576196@qq.com>
Date: Sat, 14 Oct 2023 13:20:08 +0800
Subject: [PATCH] add sentinelPassword
---
.../java/io/seata/common/ConfigurationKeys.java | 5 +++++
dependencies/pom.xml | 2 +-
script/config-center/config.txt | 1 +
.../server/storage/redis/JedisPooledFactory.java | 13 +++++--------
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/common/src/main/java/io/seata/common/ConfigurationKeys.java b/common/src/main/java/io/seata/common/ConfigurationKeys.java
index fc102507816..98bb53f388a 100644
--- a/common/src/main/java/io/seata/common/ConfigurationKeys.java
+++ b/common/src/main/java/io/seata/common/ConfigurationKeys.java
@@ -743,6 +743,11 @@ public interface ConfigurationKeys {
*/
String STORE_REDIS_SENTINEL_HOST = STORE_REDIS_SENTINEL_PREFIX + "sentinelHosts";
+ /**
+ * STORE_REDIS_SENTINEL_PASSWORD.
+ */
+ String STORE_REDIS_SENTINEL_PASSWORD = STORE_REDIS_SENTINEL_PREFIX + "sentinelPassword";
+
/**
* The constant CLIENT_DEGRADE_CHECK_PERIOD.
*/
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
index a9b951a533b..a660db2c328 100644
--- a/dependencies/pom.xml
+++ b/dependencies/pom.xml
@@ -92,7 +92,7 @@
0.2.0-RC2
- 3.2.0
+ 3.8.0
diff --git a/script/config-center/config.txt b/script/config-center/config.txt
index e4fd24380e9..ee0caa02dcc 100644
--- a/script/config-center/config.txt
+++ b/script/config-center/config.txt
@@ -105,6 +105,7 @@ store.redis.single.host=127.0.0.1
store.redis.single.port=6379
store.redis.sentinel.masterName=
store.redis.sentinel.sentinelHosts=
+store.redis.sentinel.sentinelPassword=
store.redis.maxConn=10
store.redis.minConn=1
store.redis.maxTotal=100
diff --git a/server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java b/server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java
index d3d1a442eed..45fc28e336f 100644
--- a/server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java
+++ b/server/src/main/java/io/seata/server/storage/redis/JedisPooledFactory.java
@@ -27,11 +27,7 @@
import io.seata.core.constants.ConfigurationKeys;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolAbstract;
-import redis.clients.jedis.JedisPoolConfig;
-import redis.clients.jedis.JedisSentinelPool;
+import redis.clients.jedis.*;
import static io.seata.common.DefaultValues.DEFAULT_REDIS_MAX_IDLE;
import static io.seata.common.DefaultValues.DEFAULT_REDIS_MAX_TOTAL;
@@ -59,7 +55,7 @@ public class JedisPooledFactory {
/**
* get the RedisPool instance (singleton)
- *
+ *
* @return redisPool
*/
public static JedisPoolAbstract getJedisPoolInstance(JedisPoolAbstract... jedisPools) {
@@ -98,7 +94,8 @@ public static JedisPoolAbstract getJedisPoolInstance(JedisPoolAbstract... jedisP
Set sentinels = new HashSet<>(SENTINEL_HOST_NUMBER);
String[] sentinelHosts = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_HOST).split(",");
Arrays.asList(sentinelHosts).forEach(sentinelHost -> sentinels.add(sentinelHost));
- tempJedisPool = new JedisSentinelPool(masterName, sentinels, poolConfig, 60000, password, CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_DATABASE, DATABASE));
+ tempJedisPool = new JedisSentinelPool(masterName, sentinels, poolConfig, 60000, 60000, password, CONFIGURATION.getInt(ConfigurationKeys.STORE_REDIS_DATABASE, DATABASE),
+ null, Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SENTINEL_PASSWORD), null);
} else if (mode.equals(ConfigurationKeys.REDIS_SINGLE_MODE)) {
String host = CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_SINGLE_HOST);
host = StringUtils.isBlank(host) ? CONFIGURATION.getConfig(ConfigurationKeys.STORE_REDIS_HOST, HOST) : host;
@@ -121,7 +118,7 @@ public static JedisPoolAbstract getJedisPoolInstance(JedisPoolAbstract... jedisP
/**
* get an instance of Jedis (connection) from the connection pool
- *
+ *
* @return jedis
*/
public static Jedis getJedisInstance() {