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

Custom connection pool to MultiClusterPooledConnectionProvider #3801

Merged
merged 8 commits into from
Apr 18, 2024
Merged

Custom connection pool to MultiClusterPooledConnectionProvider #3801

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dab95f9
Add support for configuring connection pool to MultiClusterPooledConn…
thachlp Apr 5, 2024
7e23603
Add ClusterConfig constructor to include ConnectionPoolConfig, add test
thachlp Apr 6, 2024
f0426e4
Update src/main/java/redis/clients/jedis/MultiClusterClientConfig.java
thachlp Apr 17, 2024
faf957a
Update src/main/java/redis/clients/jedis/MultiClusterClientConfig.java
thachlp Apr 17, 2024
c9ed879
Update test
thachlp Apr 17, 2024
7abe900
Update src/main/java/redis/clients/jedis/MultiClusterClientConfig.java
thachlp Apr 17, 2024
09afb9f
Update src/test/java/redis/clients/jedis/providers/MultiClusterPooled…
thachlp Apr 17, 2024
68e8080
Format testConnectionPoolConfigApplied
sazzad16 Apr 18, 2024
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
13 changes: 13 additions & 0 deletions src/main/java/redis/clients/jedis/MultiClusterClientConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,19 @@ public static class ClusterConfig {
private int priority;
private HostAndPort hostAndPort;
private JedisClientConfig clientConfig;
private ConnectionPoolConfig connectionPoolConfig;
thachlp marked this conversation as resolved.
Show resolved Hide resolved

public ClusterConfig(HostAndPort hostAndPort, JedisClientConfig clientConfig) {
this.hostAndPort = hostAndPort;
this.clientConfig = clientConfig;
connectionPoolConfig = new ConnectionPoolConfig();
sazzad16 marked this conversation as resolved.
Show resolved Hide resolved
thachlp marked this conversation as resolved.
Show resolved Hide resolved
}

public ClusterConfig(HostAndPort hostAndPort, JedisClientConfig clientConfig,
ConnectionPoolConfig connectionPoolConfig) {
thachlp marked this conversation as resolved.
Show resolved Hide resolved
this.hostAndPort = hostAndPort;
this.clientConfig = clientConfig;
this.connectionPoolConfig = connectionPoolConfig;
}

public int getPriority() {
Expand All @@ -198,6 +207,10 @@ public HostAndPort getHostAndPort() {
public JedisClientConfig getJedisClientConfig() {
return clientConfig;
}

public ConnectionPoolConfig getConnectionPoolConfig() {
return connectionPoolConfig;
}
}

public static class Builder {
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ public MultiClusterPooledConnectionProvider(MultiClusterClientConfig multiCluste

ClusterConfig[] clusterConfigs = multiClusterClientConfig.getClusterConfigs();
for (ClusterConfig config : clusterConfigs) {
ConnectionPoolConfig poolConfig = config.getConnectionPoolConfig();

String clusterId = "cluster:" + config.getPriority() + ":" + config.getHostAndPort();

Expand All @@ -132,7 +133,7 @@ public MultiClusterPooledConnectionProvider(MultiClusterClientConfig multiCluste

multiClusterMap.put(config.getPriority(),
new Cluster(new ConnectionPool(config.getHostAndPort(),
config.getJedisClientConfig()), retry, circuitBreaker));
config.getJedisClientConfig(), poolConfig), retry, circuitBreaker));
sazzad16 marked this conversation as resolved.
Show resolved Hide resolved
}

/// --- ///
Expand Down
17 changes: 15 additions & 2 deletions src/test/java/redis/clients/jedis/providers/MultiClusterPooledConnectionProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,14 @@ public class MultiClusterPooledConnectionProviderTest {

@Before
public void setUp() {
ConnectionPoolConfig poolConfig = new ConnectionPoolConfig();
poolConfig.setMaxTotal(8);
poolConfig.setMaxIdle(4);
poolConfig.setMinIdle(1);

ClusterConfig[] clusterConfigs = new ClusterConfig[2];
clusterConfigs[0] = new ClusterConfig(hostAndPort1, DefaultJedisClientConfig.builder().build());
clusterConfigs[1] = new ClusterConfig(hostAndPort2, DefaultJedisClientConfig.builder().build());
clusterConfigs[0] = new ClusterConfig(hostAndPort1, DefaultJedisClientConfig.builder().build(), poolConfig);
clusterConfigs[1] = new ClusterConfig(hostAndPort2, DefaultJedisClientConfig.builder().build(), poolConfig);
sazzad16 marked this conversation as resolved.
Show resolved Hide resolved

provider = new MultiClusterPooledConnectionProvider(new MultiClusterClientConfig.Builder(clusterConfigs).build());
}
Expand Down Expand Up @@ -131,4 +135,13 @@ public void testSetActiveMultiClusterIndexOutOfRange() {
provider.setActiveMultiClusterIndex(3); // Should throw an exception
}

@Test
public void testConnectionPoolConfigApplied() {
MultiClusterPooledConnectionProvider.Cluster activeCluster = provider.getCluster();
ConnectionPool connectionPool = activeCluster.getConnectionPool();

assertEquals(8, connectionPool.getMaxTotal());
assertEquals(4, connectionPool.getMaxIdle());
assertEquals(1, connectionPool.getMinIdle());
}
}