From 5c161775df4c52e42eec248f20757ba55c7801a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz?= Date: Fri, 28 Feb 2025 11:49:32 +0100 Subject: [PATCH] Fix the "of" string in RedisExecutor exceptions Signed-off-by: lkk7 --- .../java/org/redisson/command/RedisExecutor.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/redisson/src/main/java/org/redisson/command/RedisExecutor.java b/redisson/src/main/java/org/redisson/command/RedisExecutor.java index 5f3ca6dda..12bdc40d1 100644 --- a/redisson/src/main/java/org/redisson/command/RedisExecutor.java +++ b/redisson/src/main/java/org/redisson/command/RedisExecutor.java @@ -233,7 +233,7 @@ public class RedisExecutor { "Increase connection pool size or timeout. " + "Node source: " + source + ", " + LogHelper.toString(command, params) - + " after " + attempt + "of " + attempts + " retry attempts"); + + " after " + attempt + " of " + attempts + " retry attempts"); attemptPromise.completeExceptionally(exception); } @@ -258,7 +258,7 @@ public class RedisExecutor { + " Netty pending tasks: " + pendingTasks + "," + " Node source: " + source + ", connection: " + connectionFuture.join() + ", " + LogHelper.toString(command, params) - + " after " + attempt + "of " + attempts + " retry attempts"); + + " after " + attempt + " of " + attempts + " retry attempts"); attemptPromise.completeExceptionally(exception); } }; @@ -284,7 +284,7 @@ public class RedisExecutor { "Increase connection pool size. " + "Node source: " + source + ", " + LogHelper.toString(command, params) - + " after " + attempt + "of " + attempts + " retry attempts"); + + " after " + attempt + " of " + attempts + " retry attempts"); } else { if (connectionFuture.isDone() && !connectionFuture.isCompletedExceptionally()) { if (writeFuture == null || !writeFuture.isDone()) { @@ -298,7 +298,7 @@ public class RedisExecutor { " Netty pending tasks: " + pendingTasks + "," + " Node source: " + source + ", connection: " + getNow(connectionFuture) + ", " + LogHelper.toString(command, params) - + " after " + attempt + "of " + attempts + " retry attempts"); + + " after " + attempt + " of " + attempts + " retry attempts"); } attemptPromise.completeExceptionally(exception); } @@ -376,7 +376,7 @@ public class RedisExecutor { "Node source: " + source + ", connection: " + connection + ", " + LogHelper.toString(command, params) - + " after " + attempt + "of " + attempts + " retry attempts", + + " after " + attempt + " of " + attempts + " retry attempts", future.cause()); tryComplete(attemptPromise, exception); return; @@ -465,7 +465,7 @@ public class RedisExecutor { int pendingTasks = countPendingTasks(); attemptPromise.completeExceptionally( new RedisResponseTimeoutException("Redis server response timeout (" + timeoutAmount + " ms) occured" - + " after " + attempt + "of " + attempts + " retry attempts," + + " after " + attempt + " of " + attempts + " retry attempts," + " is non-idempotent command: " + (command != null && command.isNoRetry()) + " Check connection with Redis node: " + connection.getRedisClient().getAddr() + " for TCP packet drops or bandwidth limits. " + " Try to increase nettyThreads and/or timeout settings."