From c408ec984492c6a288d1d46ed3f6e79f9d2a7b91 Mon Sep 17 00:00:00 2001 From: Fridtjof Sander Date: Tue, 17 Dec 2019 18:37:24 +0100 Subject: [PATCH] ReplicatedConnectionManager triggers reactivation of slaves with ip address instead of hostname Signed-off-by: Fridtjof Sander --- .../redisson/connection/ReplicatedConnectionManager.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java index f66f77206..47632c0fc 100644 --- a/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java @@ -15,6 +15,7 @@ */ package org.redisson.connection; +import java.net.InetSocketAddress; import java.util.Map; import java.util.UUID; import java.util.concurrent.TimeUnit; @@ -168,7 +169,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager { }); } } else if (!config.checkSkipSlavesInit()) { - slaveUp(addr); + slaveUp(addr, connection.getRedisClient().getAddr()); } if (count.decrementAndGet() == 0) { @@ -182,9 +183,9 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager { }, cfg.getScanInterval(), TimeUnit.MILLISECONDS); } - private void slaveUp(RedisURI uri) { + private void slaveUp(RedisURI uri, InetSocketAddress address) { MasterSlaveEntry entry = getEntry(singleSlotRange.getStartSlot()); - if (entry.slaveUp(uri, FreezeReason.MANAGER)) { + if (entry.slaveUp(address, FreezeReason.MANAGER)) { log.info("slave: {} has up", uri); } }