Skip to content

Support Sentinel with TLS (II) #2403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 31, 2021
Merged

Support Sentinel with TLS (II) #2403

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6cfa72f
Support Sentinel with TLS
sazzad16 Mar 7, 2021
95f68a7
Merge branch 'master' into sentinel-tls-3
gkorland Mar 10, 2021
a30e163
change config variables to protected
sazzad16 Mar 10, 2021
0c7bfea
use method reference and avoid parallel stream
sazzad16 Mar 24, 2021
3a7feac
Merge remote-tracking branch 'redis/master' into sentinel-tls-3
sazzad16 Mar 24, 2021
8f79673
remove more deprecated variables
sazzad16 Mar 25, 2021
73f5979
Merge branch 'master' into sentinel-tls-3
sazzad16 Mar 25, 2021
71d9ac2
Merge branch 'master' into sentinel-tls-3
sazzad16 Mar 29, 2021
f6aa3f5
Merge branch 'master' into sentinel-tls-3
sazzad16 Mar 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 30 additions & 56 deletions src/main/java/redis/clients/jedis/JedisSentinelPool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package redis.clients.jedis;

import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Collection;
import java.util.List;
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
Expand All @@ -16,33 +17,13 @@

public class JedisSentinelPool extends JedisPoolAbstract {

/**
* @deprecated This will be private in future.
*/
@Deprecated
protected static Logger log = LoggerFactory.getLogger(JedisSentinelPool.class);
private static final Logger LOG = LoggerFactory.getLogger(JedisSentinelPool.class);

@Deprecated protected final GenericObjectPoolConfig<Jedis> poolConfig;
private final JedisFactory factory;

@Deprecated protected int connectionTimeout;
@Deprecated protected int soTimeout;
@Deprecated protected int infiniteSoTimeout;

@Deprecated protected String user;
@Deprecated protected String password;
@Deprecated protected int database;
@Deprecated protected String clientName;

@Deprecated protected int sentinelConnectionTimeout;
@Deprecated protected int sentinelSoTimeout;
@Deprecated protected String sentinelUser;
@Deprecated protected String sentinelPassword;
@Deprecated protected String sentinelClientName;

private final JedisClientConfig sentinelClientConfig;

protected final Set<MasterListener> masterListeners = new HashSet<>();
protected final Collection<MasterListener> masterListeners = new ArrayList<>();

private volatile HostAndPort currentHostMaster;

Expand Down Expand Up @@ -163,19 +144,14 @@ public JedisSentinelPool(String masterName, Set<String> sentinels,
final String user, final String password, final int database, final String clientName,
final int sentinelConnectionTimeout, final int sentinelSoTimeout, final String sentinelUser,
final String sentinelPassword, final String sentinelClientName) {
this(masterName, sentinels, poolConfig, new JedisFactory(connectionTimeout, soTimeout, infiniteSoTimeout, user, password, database, clientName));
this.connectionTimeout = connectionTimeout;
this.soTimeout = soTimeout;
this.infiniteSoTimeout = infiniteSoTimeout;
this.user = user;
this.password = password;
this.database = database;
this.clientName = clientName;
this.sentinelConnectionTimeout = sentinelConnectionTimeout;
this.sentinelSoTimeout = sentinelSoTimeout;
this.sentinelUser = sentinelUser;
this.sentinelPassword = sentinelPassword;
this.sentinelClientName = sentinelClientName;
this(masterName, parseHostAndPorts(sentinels), poolConfig,
DefaultJedisClientConfig.builder().connectionTimeoutMillis(connectionTimeout)
.socketTimeoutMillis(soTimeout).blockingSocketTimeoutMillis(infiniteSoTimeout)
.user(user).password(password).database(database).clientName(clientName).build(),
DefaultJedisClientConfig.builder().connectionTimeoutMillis(sentinelConnectionTimeout)
.socketTimeoutMillis(sentinelSoTimeout).user(sentinelUser).password(sentinelPassword)
.clientName(sentinelClientName).build()
);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
Expand All @@ -195,7 +171,6 @@ public JedisSentinelPool(String masterName, Set<HostAndPort> sentinels,
final JedisClientConfig sentinelClientConfig) {
super(poolConfig, factory);

this.poolConfig = poolConfig;
this.factory = factory;
this.sentinelClientConfig = sentinelClientConfig;

Expand Down Expand Up @@ -229,7 +204,7 @@ private void initMaster(HostAndPort master) {
// this call only clears idle instances, not borrowed instances
clearInternalPool();

log.info("Created JedisSentinelPool to master at {}", master);
LOG.info("Created JedisSentinelPool to master at {}", master);
}
}
}
Expand All @@ -239,11 +214,11 @@ private HostAndPort initSentinels(Set<HostAndPort> sentinels, final String maste
HostAndPort master = null;
boolean sentinelAvailable = false;

log.info("Trying to find master from available Sentinels...");
LOG.info("Trying to find master from available Sentinels...");

for (HostAndPort sentinel : sentinels) {

log.debug("Connecting to Sentinel {}", sentinel);
LOG.debug("Connecting to Sentinel {}", sentinel);

try (Jedis jedis = new Jedis(sentinel, sentinelClientConfig)) {

Expand All @@ -253,19 +228,18 @@ private HostAndPort initSentinels(Set<HostAndPort> sentinels, final String maste
sentinelAvailable = true;

if (masterAddr == null || masterAddr.size() != 2) {
log.warn("Can not get master addr, master name: {}. Sentinel: {}", masterName, sentinel);
LOG.warn("Can not get master addr, master name: {}. Sentinel: {}", masterName, sentinel);
continue;
}

master = toHostAndPort(masterAddr);
log.debug("Found Redis master at {}", master);
LOG.debug("Found Redis master at {}", master);
break;
} catch (JedisException e) {
// resolves #1036, it should handle JedisException there's another chance
// of raising JedisDataException
log.warn(
"Cannot get master address from sentinel running @ {}. Reason: {}. Trying next one.",
sentinel, e);
LOG.warn(
"Cannot get master address from sentinel running @ {}. Reason: {}. Trying next one.", sentinel, e);
}
}

Expand All @@ -280,7 +254,7 @@ private HostAndPort initSentinels(Set<HostAndPort> sentinels, final String maste
}
}

log.info("Redis master running at {}, starting Sentinel listeners...", master);
LOG.info("Redis master running at {}, starting Sentinel listeners...", master);

for (HostAndPort sentinel : sentinels) {

Expand Down Expand Up @@ -329,7 +303,7 @@ public void returnResource(final Jedis resource) {
returnResourceObject(resource);
} catch (Exception e) {
returnBrokenResource(resource);
log.debug("Resource is returned to the pool as broken", e);
LOG.debug("Resource is returned to the pool as broken", e);
}
}
}
Expand Down Expand Up @@ -378,7 +352,7 @@ public void run() {
// code for active refresh
List<String> masterAddr = j.sentinelGetMasterAddrByName(masterName);
if (masterAddr == null || masterAddr.size() != 2) {
log.warn("Can not get master addr, master name: {}. Sentinel: {}.", masterName,
LOG.warn("Can not get master addr, master name: {}. Sentinel: {}.", masterName,
hostPort);
} else {
initMaster(toHostAndPort(masterAddr));
Expand All @@ -387,7 +361,7 @@ public void run() {
j.subscribe(new JedisPubSub() {
@Override
public void onMessage(String channel, String message) {
log.debug("Sentinel {} published: {}.", hostPort, message);
LOG.debug("Sentinel {} published: {}.", hostPort, message);

String[] switchMasterMsg = message.split(" ");

Expand All @@ -396,13 +370,13 @@ public void onMessage(String channel, String message) {
if (masterName.equals(switchMasterMsg[0])) {
initMaster(toHostAndPort(Arrays.asList(switchMasterMsg[3], switchMasterMsg[4])));
} else {
log.debug(
LOG.debug(
"Ignoring message on +switch-master for master name {}, our master name is {}",
switchMasterMsg[0], masterName);
}

} else {
log.error("Invalid message received on Sentinel {} on channel +switch-master: {}",
LOG.error("Invalid message received on Sentinel {} on channel +switch-master: {}",
hostPort, message);
}
}
Expand All @@ -411,15 +385,15 @@ public void onMessage(String channel, String message) {
} catch (JedisException e) {

if (running.get()) {
log.error("Lost connection to Sentinel at {}:{}. Sleeping 5000ms and retrying.", host,
LOG.error("Lost connection to Sentinel at {}:{}. Sleeping 5000ms and retrying.", host,
port, e);
try {
Thread.sleep(subscribeRetryWaitTimeMillis);
} catch (InterruptedException e1) {
log.error("Sleep interrupted: ", e1);
LOG.error("Sleep interrupted: ", e1);
}
} else {
log.debug("Unsubscribing from Sentinel at {}:{}", host, port);
LOG.debug("Unsubscribing from Sentinel at {}:{}", host, port);
}
} finally {
if (j != null) {
Expand All @@ -431,14 +405,14 @@ public void onMessage(String channel, String message) {

public void shutdown() {
try {
log.debug("Shutting down listener on {}:{}", host, port);
LOG.debug("Shutting down listener on {}:{}", host, port);
running.set(false);
// This isn't good, the Jedis object is not thread safe
if (j != null) {
j.close();
}
} catch (Exception e) {
log.error("Caught exception while shutting down: ", e);
LOG.error("Caught exception while shutting down: ", e);
}
}
}
Expand Down