From 31d5140b7636cf598722a37b2300cc2b59d2cc0b Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Thu, 31 May 2018 09:45:05 +0300
Subject: [PATCH] Fixed - ClusterConnectionManager should use shared
resolverGroup
---
.../redisson/cluster/ClusterConnectionManager.java | 2 +-
.../connection/MasterSlaveConnectionManager.java | 13 -------------
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index 20d1f28be..dd5585e50 100644
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -288,7 +288,7 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
public void run() {
if (isConfigEndpoint) {
final URI uri = cfg.getNodeAddresses().iterator().next();
- final AddressResolver<InetSocketAddress> resolver = createResolverGroup().getResolver(getGroup().next());
+ final AddressResolver<InetSocketAddress> resolver = resolverGroup.getResolver(getGroup().next());
Future<List<InetSocketAddress>> allNodes = resolver.resolveAll(InetSocketAddress.createUnresolved(uri.getHost(), uri.getPort()));
allNodes.addListener(new FutureListener<List<InetSocketAddress>>() {
@Override
diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
index e9150eb58..fb1e0693b 100644
--- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java
@@ -211,19 +211,6 @@ public class MasterSlaveConnectionManager implements ConnectionManager {
this.commandExecutor = new CommandSyncService(this);
}
- /*
- * Remove it once https://github.com/netty/netty/issues/7882 get resolved
- */
- protected DnsAddressResolverGroup createResolverGroup() {
- if (cfg.getTransportMode() == TransportMode.EPOLL) {
- return cfg.getAddressResolverGroupFactory().create(EpollDatagramChannel.class, DnsServerAddressStreamProviders.platformDefault());
- } else if (cfg.getTransportMode() == TransportMode.KQUEUE) {
- return cfg.getAddressResolverGroupFactory().create(KQueueDatagramChannel.class, DnsServerAddressStreamProviders.platformDefault());
- }
-
- return cfg.getAddressResolverGroupFactory().create(NioDatagramChannel.class, DnsServerAddressStreamProviders.platformDefault());
- }
-
protected void closeNodeConnections() {
List<RFuture<Void>> futures = new ArrayList<RFuture<Void>>();
for (RedisConnection connection : nodeConnections.values()) {