bugfix

apache · Oct 17, 2023 · 9878a1d · 9878a1d
1 parent 104a8f5
commit 9878a1d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/changes/en-us/2.0.0.md b/changes/en-us/2.0.0.md
@@ -75,7 +75,7 @@ The version is updated as follows:
 - [[#5821](https://github.com/seata/seata/pull/5821)] fix insert executor keywords unescape
 - [[#5835](https://github.com/seata/seata/pull/5835)] bugfix: fix TC retry rollback wrongly, after the XA transaction fail and rollback
 - [[#5881](https://github.com/seata/seata/pull/5880)] fix delete branch table unlock failed
-- [[#5930](https://github.com/seata/seata/pull/5930)] fix the problem of missing sentinel password in store redis mode
+- [[#5930](https://github.com/seata/seata/pull/5930)] fix the issue of missing sentinel password in store redis mode
 
 ### optimize：
 - [[#5208](https://github.com/seata/seata/pull/5208)] optimize throwable getCause once more

diff --git a/...java/io/seata/spring/boot/autoconfigure/properties/server/store/StoreRedisProperties.java b/...java/io/seata/spring/boot/autoconfigure/properties/server/store/StoreRedisProperties.java
@@ -149,6 +149,8 @@ public static class Sentinel {
          */
         private String sentinelHosts;
 
+        private String sentinelPassword;
+
         public String getMasterName() {
             return masterName;
         }
@@ -166,5 +168,14 @@ public Sentinel setSentinelHosts(String sentinelHosts) {
             this.sentinelHosts = sentinelHosts;
             return this;
         }
+
+        public String getSentinelPassword() {
+            return sentinelPassword;
+        }
+
+        public Sentinel setSentinelPassword(String sentinelPassword) {
+            this.sentinelPassword = sentinelPassword;
+            return this;
+        }
     }
 }
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
@@ -27,8 +27,12 @@
 import io.seata.core.constants.ConfigurationKeys;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import redis.clients.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.Protocol;
+import redis.clients.jedis.Jedis;
 import static io.seata.common.DefaultValues.DEFAULT_REDIS_MAX_IDLE;
 import static io.seata.common.DefaultValues.DEFAULT_REDIS_MAX_TOTAL;
 import static io.seata.common.DefaultValues.DEFAULT_REDIS_MIN_IDLE;

diff --git a/server/src/main/resources/application.example.yml b/server/src/main/resources/application.example.yml
@@ -182,6 +182,7 @@ seata:
       sentinel:
         master-name:
         sentinel-hosts:
+        sentinel-password:
   metrics:
     enabled: false
     registry-type: compact