From d7ee56a8ad237d481121e45a8631c0adf749037c Mon Sep 17 00:00:00 2001 From: bharadwajembar Date: Thu, 18 Jul 2019 09:49:09 +0530 Subject: [PATCH 1/2] Modified RedisClusterJedisProvider to use auth --- .../conductor/jedis/RedisClusterJedisProvider.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java index ef663469ac..e0649c168e 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java @@ -27,9 +27,15 @@ public RedisClusterJedisProvider(HostSupplier hostSupplier){ public JedisCommands get() { // FIXME This doesn't seem very safe, but is how it was in the code this was moved from. Host host = new ArrayList(hostSupplier.getHosts()).get(0); + String password = host.getPassword(); GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig(); poolConfig.setMinIdle(5); poolConfig.setMaxTotal(1000); - return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig); + if (password.length() == 0) { + return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig); + } else { + return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), 100000, 100000, + 3, host.getPassword(), poolConfig); + } } } From b3cacac0c1de07d02742d4f75e1bdea3156a5782 Mon Sep 17 00:00:00 2001 From: bharadwajembar Date: Thu, 18 Jul 2019 11:05:50 +0530 Subject: [PATCH 2/2] password variable usage fix --- .../com/netflix/conductor/jedis/RedisClusterJedisProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java index e0649c168e..43e8f538a1 100644 --- a/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java +++ b/redis-persistence/src/main/java/com/netflix/conductor/jedis/RedisClusterJedisProvider.java @@ -35,7 +35,7 @@ public JedisCommands get() { return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), poolConfig); } else { return new JedisCluster(new HostAndPort(host.getHostName(), host.getPort()), 100000, 100000, - 3, host.getPassword(), poolConfig); + 3, password, poolConfig); } } }