diff --git a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java index 30f98b3f3..dadba23bd 100644 --- a/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java +++ b/redisson/src/main/java/org/redisson/connection/MasterSlaveConnectionManager.java @@ -222,7 +222,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { String hostname = hostnameMapper.apply(uri); CompletableFuture masterFuture = masterSlaveEntry.setupMasterEntry(uri, hostname); try { - masterFuture.get(config.getConnectTimeout(), TimeUnit.MILLISECONDS); + masterFuture.get(config.getConnectTimeout()*config.getMasterConnectionMinimumIdleSize(), TimeUnit.MILLISECONDS); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } catch (ExecutionException | TimeoutException e) { @@ -232,7 +232,7 @@ public class MasterSlaveConnectionManager implements ConnectionManager { if (!config.isSlaveNotUsed()) { CompletableFuture fs = masterSlaveEntry.initSlaveBalancer(disconnectedSlaves, hostnameMapper); try { - fs.get(config.getConnectTimeout(), TimeUnit.MILLISECONDS); + fs.get(config.getConnectTimeout()*config.getSlaveConnectionMinimumIdleSize(), TimeUnit.MILLISECONDS); } catch (InterruptedException e) { Thread.currentThread().interrupt(); } catch (ExecutionException | TimeoutException e) {