From a8d0614d5c936c02f2be23cce54f4e2198d98051 Mon Sep 17 00:00:00 2001
From: Nikita <abracham.mitchell@gmail.com>
Date: Mon, 16 Nov 2015 16:48:26 +0300
Subject: [PATCH] Check failedAttempts value in tryAcquireConnection. #262

---
 src/main/java/org/redisson/CommandExecutorService.java     | 2 +-
 src/main/java/org/redisson/connection/ConnectionEntry.java | 4 ++++
 src/main/java/org/redisson/misc/ConnectionPool.java        | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/redisson/CommandExecutorService.java b/src/main/java/org/redisson/CommandExecutorService.java
index c55405208..7a728b4cf 100644
--- a/src/main/java/org/redisson/CommandExecutorService.java
+++ b/src/main/java/org/redisson/CommandExecutorService.java
@@ -429,7 +429,7 @@ public class CommandExecutorService implements CommandExecutor {
                     return;
                 }
                 if (attempt == connectionManager.getConfig().getRetryAttempts()) {
-                    attemptPromise.setFailure(ex.get());
+                    attemptPromise.tryFailure(ex.get());
                     return;
                 }
                 if (!attemptPromise.cancel(false)) {
diff --git a/src/main/java/org/redisson/connection/ConnectionEntry.java b/src/main/java/org/redisson/connection/ConnectionEntry.java
index 71c877ad0..f7acd33f4 100644
--- a/src/main/java/org/redisson/connection/ConnectionEntry.java
+++ b/src/main/java/org/redisson/connection/ConnectionEntry.java
@@ -64,6 +64,10 @@ public class ConnectionEntry {
         failedAttempts.set(0);
     }
 
+    public int getFailedAttempts() {
+        return failedAttempts.get();
+    }
+
     public int incFailedAttempts() {
         return failedAttempts.incrementAndGet();
     }
diff --git a/src/main/java/org/redisson/misc/ConnectionPool.java b/src/main/java/org/redisson/misc/ConnectionPool.java
index aacad5850..3003e68c1 100644
--- a/src/main/java/org/redisson/misc/ConnectionPool.java
+++ b/src/main/java/org/redisson/misc/ConnectionPool.java
@@ -102,7 +102,7 @@ public class ConnectionPool<T extends RedisConnection> {
     }
 
     protected boolean tryAcquireConnection(SubscribesConnectionEntry entry) {
-        return entry.tryAcquireConnection();
+        return entry.getFailedAttempts() < config.getSlaveFailedAttempts() && entry.tryAcquireConnection();
     }
 
     protected T poll(SubscribesConnectionEntry entry) {
@@ -168,8 +168,8 @@ public class ConnectionPool<T extends RedisConnection> {
 
 
     private void promiseFailure(SubscribesConnectionEntry entry, Promise<T> promise, T conn) {
+        int attempts = entry.incFailedAttempts();
         if (entry.getNodeType() == NodeType.SLAVE) {
-            int attempts = entry.incFailedAttempts();
             if (attempts == config.getSlaveFailedAttempts()) {
                 connectionManager.slaveDown(masterSlaveEntry, entry.getClient().getAddr().getHostName(),
                         entry.getClient().getAddr().getPort(), FreezeReason.RECONNECT);