Skip to content
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

Jump to bottom

Configure a Sentinel Connection when initialising the Sentinel pool #1943

Merged
merged 5 commits into from Nov 26, 2019
Merged

Configure a Sentinel Connection when initialising the Sentinel pool #1943

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
dd46bdd
This commit attempts to resolve #1487 and #1636.
Jan 28, 2019
080c413
Initial code review.
Jan 29, 2019
a24025a
Code review.
Jan 29, 2019
c6abed6
Code review.
Jan 29, 2019
7ffb1cd
Format code.
sazzad16 Nov 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/main/java/redis/clients/jedis/BinaryJedis.java
View file
Open in desktop
Expand Up @@ -95,6 +95,14 @@ public BinaryJedis(final String host, final int port, final int connectionTimeou
client.setSoTimeout(soTimeout);
}

public BinaryJedis(final String host, final int port, final int connectionTimeout,
final int soTimeout, final String password) {
karltinawi marked this conversation as resolved.
Show resolved Hide resolved
client = new Client(host, port);
client.setConnectionTimeout(connectionTimeout);
client.setSoTimeout(soTimeout);
client.setPassword(password);
}

public BinaryJedis(final String host, final int port, final int connectionTimeout,
final int soTimeout, final boolean ssl) {
client = new Client(host, port, ssl);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/redis/clients/jedis/Jedis.java
View file
Open in desktop
Expand Up @@ -78,6 +78,11 @@ public Jedis(final String host, final int port, final int connectionTimeout, fin
super(host, port, connectionTimeout, soTimeout);
}

public Jedis(final String host, final int port, final int connectionTimeout, final int soTimeout,
final String password) {
karltinawi marked this conversation as resolved.
Show resolved Hide resolved
super(host, port, connectionTimeout, soTimeout, password);
}

public Jedis(final String host, final int port, final int connectionTimeout, final int soTimeout,
final boolean ssl) {
super(host, port, connectionTimeout, soTimeout, ssl);
Expand Down
29 changes: 22 additions & 7 deletions src/main/java/redis/clients/jedis/JedisSentinelPool.java
View file
Open in desktop
Expand Up @@ -17,12 +17,15 @@ public class JedisSentinelPool extends JedisPoolAbstract {

protected GenericObjectPoolConfig poolConfig;

protected int connectionTimeout = Protocol.DEFAULT_TIMEOUT;
protected int soTimeout = Protocol.DEFAULT_TIMEOUT;

protected int connectionTimeout;
protected int soTimeout;
protected String password;

protected int database = Protocol.DEFAULT_DATABASE;
protected int sentinelConnectionTimeout;
karltinawi marked this conversation as resolved.
Show resolved Hide resolved
protected int sentinelSoTimeout;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should all these fields be final?

protected String sentinelPassword;

protected int database;

protected String clientName;

Expand Down Expand Up @@ -84,14 +87,26 @@ public JedisSentinelPool(String masterName, Set<String> sentinels,
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
final GenericObjectPoolConfig poolConfig, final int connectionTimeout, final int soTimeout,
final String password, final int database, final String clientName) {
final GenericObjectPoolConfig poolConfig, final int connectionTimeout, final int soTimeout, final String password,
final int database, final String clientName) {
this(masterName, sentinels, poolConfig, connectionTimeout, soTimeout, password, database, clientName,
Protocol.DEFAULT_TIMEOUT, Protocol.DEFAULT_TIMEOUT, null);
}

public JedisSentinelPool(String masterName, Set<String> sentinels,
karltinawi marked this conversation as resolved.
Show resolved Hide resolved
final GenericObjectPoolConfig poolConfig, final int connectionTimeout, final int soTimeout, final String password,
final int database, final String clientName,
final int sentinelConnectionTimeout, final int sentinelSoTimeout, final String sentinelPassword) {
karltinawi marked this conversation as resolved.
Show resolved Hide resolved

this.poolConfig = poolConfig;
this.connectionTimeout = connectionTimeout;
this.soTimeout = soTimeout;
this.password = password;
this.database = database;
this.clientName = clientName;
this.sentinelConnectionTimeout = sentinelConnectionTimeout;
this.sentinelSoTimeout = sentinelSoTimeout;
this.sentinelPassword = sentinelPassword;

HostAndPort master = initSentinels(sentinels, masterName);
initPool(master);
Expand Down Expand Up @@ -146,7 +161,7 @@ private HostAndPort initSentinels(Set<String> sentinels, final String masterName

Jedis jedis = null;
try {
jedis = new Jedis(hap);
jedis = new Jedis(hap.getHost(), hap.getPort(), sentinelConnectionTimeout, sentinelSoTimeout, sentinelPassword);
karltinawi marked this conversation as resolved.
Show resolved Hide resolved

List<String> masterAddr = jedis.sentinelGetMasterAddrByName(masterName);

Expand Down