NXP-18884: Add retry logic to default Redis pool

nuxeo · Feb 2, 2016 · 335210c · 335210c
1 parent e02d24d
commit 335210c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...o-core/nuxeo-core-redis/src/main/java/org/nuxeo/ecm/core/redis/RedisServerDescriptor.java b/...o-core/nuxeo-core-redis/src/main/java/org/nuxeo/ecm/core/redis/RedisServerDescriptor.java
@@ -22,7 +22,6 @@
 import org.nuxeo.common.xmap.annotation.XNode;
 import org.nuxeo.common.xmap.annotation.XObject;
 import org.nuxeo.ecm.core.api.NuxeoException;
-
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 import redis.clients.jedis.JedisPoolConfig;
@@ -45,6 +44,9 @@ public class RedisServerDescriptor extends RedisPoolDescriptor {
     @XNode("port")
     public int port = Protocol.DEFAULT_PORT;
 
+    @XNode("failoverTimeout")
+    public int failoverTimeout = 300;
+
     protected boolean canConnect(String name, int port) {
         try (Jedis jedis = new Jedis(name, port)) {
             if (StringUtils.isNotBlank(password)) {
@@ -72,8 +74,9 @@ public RedisExecutor newExecutor() {
         JedisPoolConfig conf = new JedisPoolConfig();
         conf.setMaxTotal(maxTotal);
         conf.setMaxIdle(maxIdle);
-        return new RedisPoolExecutor(new JedisPool(conf, host, port, timeout,
+        RedisExecutor base = new RedisPoolExecutor(new JedisPool(conf, host, port, timeout,
                 StringUtils.defaultIfBlank(password, null), database));
+        return new RedisFailoverExecutor(failoverTimeout, base);
     }
 
 }