From 7e546bb4dfbb2195ca5b2464cd0e8eee61e5ab54 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Sat, 13 Apr 2024 08:50:54 +0300
Subject: [PATCH] logs improved

---
 .../cluster/ClusterConnectionManager.java     | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
index 2e8f11a43..b3f9bcf02 100644
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@@ -555,12 +555,18 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
         Set<RedisURI> removedSlaves = new HashSet<>(currentPart.getSlaveAddresses());
         removedSlaves.removeAll(newPart.getSlaveAddresses());
 
+        if (!removedSlaves.isEmpty()) {
+            log.info("removed slaves detected for master {}. current slaves {} last slaves {}",
+                    currentPart.getMasterAddress(), currentPart.getSlaveAddresses(), newPart.getSlaveAddresses());
+        }
+
         for (RedisURI uri : removedSlaves) {
             currentPart.removeSlaveAddress(uri);
 
             if (config.isSlaveNotUsed() || entry.slaveDown(uri, FreezeReason.MANAGER)) {
                 disconnectNode(uri);
-                log.info("slave {} removed for slot ranges: {}", uri, currentPart.getSlotRanges());
+                log.info("slave {} removed for master {} and slot ranges: {}",
+                        currentPart.getMasterAddress(), uri, currentPart.getSlotRanges());
             }
         }
 
@@ -569,6 +575,12 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
                                                                                 && !newPart.getFailedSlaveAddresses().contains(uri))
                                                                 .collect(Collectors.toSet());
 
+        if (!addedSlaves.isEmpty()) {
+            log.info("added slaves detected for master {}. current slaves {} last slaves {} last failed slaves {}",
+                    currentPart.getMasterAddress(), currentPart.getSlaveAddresses(),
+                    newPart.getSlaveAddresses(), newPart.getFailedSlaveAddresses());
+        }
+
         List<CompletableFuture<?>> futures = new ArrayList<>();
         for (RedisURI uri : addedSlaves) {
             ClientConnectionsEntry slaveEntry = entry.getEntry(uri);
@@ -577,7 +589,8 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
                 slaveUpFuture = slaveUpFuture.thenApply(v -> {
                     if (v) {
                         currentPart.addSlaveAddress(uri);
-                        log.info("slave: {} added for slot ranges: {}", uri, currentPart.getSlotRanges());
+                        log.info("slave: {} unfreezed for master {} and slot ranges: {}",
+                                currentPart.getMasterAddress(), uri, currentPart.getSlotRanges());
                         entry.excludeMasterFromSlaves(uri);
                     }
                     return v;
@@ -589,7 +602,8 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
             CompletableFuture<Void> slaveUpFuture = entry.addSlave(uri, false, configEndpointHostName);
             CompletableFuture<Void> f = slaveUpFuture.thenAccept(res -> {
                 currentPart.addSlaveAddress(uri);
-                log.info("slave: {} added for slot ranges: {}", uri, currentPart.getSlotRanges());
+                log.info("slave: {} added for master {} and slot ranges: {}",
+                        currentPart.getMasterAddress(), uri, currentPart.getSlotRanges());
                 entry.excludeMasterFromSlaves(uri);
             });
             futures.add(f);