Fixed - RedisNode.info doesn't work. #1480

redisson/src/main/java/org/redisson/RedisNodes.java

@@ -60,12 +60,12 @@ public class RedisNodes<N extends Node> implements NodesGroup<N> {
         Collection<MasterSlaveEntry> entries = connectionManager.getEntrySet();
         URI addr = URIBuilder.create(address);
         for (MasterSlaveEntry masterSlaveEntry : entries) {
-            if (URIBuilder.compare(masterSlaveEntry.getClient().getAddr(), addr)) {
+            if (masterSlaveEntry.getAllEntries().isEmpty() && URIBuilder.compare(masterSlaveEntry.getClient().getAddr(), addr)) {
                 return (N) new RedisClientEntry(masterSlaveEntry.getClient(), connectionManager.getCommandExecutor(), NodeType.MASTER);
             }
-            for (ClientConnectionsEntry entry : masterSlaveEntry.getSlaveEntries()) {
-                if (URIBuilder.compare(entry.getClient().getAddr(), addr) ||
-                        entry.getFreezeReason() == null || entry.getFreezeReason() == FreezeReason.RECONNECT) {
+
+            for (ClientConnectionsEntry entry : masterSlaveEntry.getAllEntries()) {
+                if (URIBuilder.compare(entry.getClient().getAddr(), addr) && entry.getFreezeReason() != FreezeReason.MANAGER) {
                     return (N) new RedisClientEntry(entry.getClient(), connectionManager.getCommandExecutor(), entry.getNodeType());
                 }
             }
@@ -78,19 +78,18 @@ public class RedisNodes<N extends Node> implements NodesGroup<N> {
         Collection<MasterSlaveEntry> entries = connectionManager.getEntrySet();
         List<N> result = new ArrayList<N>();
         for (MasterSlaveEntry masterSlaveEntry : entries) {
-            if (type == NodeType.MASTER) {
+            if (masterSlaveEntry.getAllEntries().isEmpty() && type == NodeType.MASTER) {
                 RedisClientEntry entry = new RedisClientEntry(masterSlaveEntry.getClient(), connectionManager.getCommandExecutor(), NodeType.MASTER);
                 result.add((N) entry);
             }
-            if (type == NodeType.SLAVE) {
-                for (ClientConnectionsEntry slaveEntry : masterSlaveEntry.getSlaveEntries()) {
-                    if (slaveEntry.getFreezeReason() == null || slaveEntry.getFreezeReason() == FreezeReason.RECONNECT) {
+            
+            for (ClientConnectionsEntry slaveEntry : masterSlaveEntry.getAllEntries()) {
+                if (slaveEntry.getFreezeReason() != FreezeReason.MANAGER && slaveEntry.getNodeType() == type) {
                     RedisClientEntry entry = new RedisClientEntry(slaveEntry.getClient(), connectionManager.getCommandExecutor(), slaveEntry.getNodeType());
                     result.add((N) entry);
                 }
             }
         }
-        }
         return result;
     }
 
@@ -100,11 +99,13 @@ public class RedisNodes<N extends Node> implements NodesGroup<N> {
         Collection<MasterSlaveEntry> entries = connectionManager.getEntrySet();
         List<N> result = new ArrayList<N>();
         for (MasterSlaveEntry masterSlaveEntry : entries) {
+            if (masterSlaveEntry.getAllEntries().isEmpty()) {
                 RedisClientEntry masterEntry = new RedisClientEntry(masterSlaveEntry.getClient(), connectionManager.getCommandExecutor(), NodeType.MASTER);
                 result.add((N) masterEntry);
+            }
             
-            for (ClientConnectionsEntry slaveEntry : masterSlaveEntry.getSlaveEntries()) {
-                if (slaveEntry.getFreezeReason() == null || slaveEntry.getFreezeReason() == FreezeReason.RECONNECT) {
+            for (ClientConnectionsEntry slaveEntry : masterSlaveEntry.getAllEntries()) {
+                if (slaveEntry.getFreezeReason() != FreezeReason.MANAGER) {
                     RedisClientEntry entry = new RedisClientEntry(slaveEntry.getClient(), connectionManager.getCommandExecutor(), slaveEntry.getNodeType());
                     result.add((N) entry);
                 }

redisson/src/main/java/org/redisson/connection/MasterSlaveEntry.java

@@ -352,14 +352,8 @@ public class MasterSlaveEntry {
         return slaveBalancer.getEntry(client);
     }
     
-    public Collection<ClientConnectionsEntry> getSlaveEntries() {
-        List<ClientConnectionsEntry> result = new ArrayList<ClientConnectionsEntry>();
-        for (ClientConnectionsEntry slaveEntry : slaveBalancer.getEntries()) {
-            if (slaveEntry.getNodeType() == NodeType.SLAVE) {
-                result.add(slaveEntry);
-            }
-        }
-        return result;
+    public Collection<ClientConnectionsEntry> getAllEntries() {
+        return slaveBalancer.getEntries();
     }
     
     public RedisClient getClient() {

redisson/src/test/java/org/redisson/RedissonTest.java

@@ -32,6 +32,7 @@ import org.redisson.ClusterRunner.ClusterProcesses;
 import org.redisson.RedisRunner.RedisProcess;
 import org.redisson.api.ClusterNode;
 import org.redisson.api.Node;
+import org.redisson.api.NodeType;
 import org.redisson.api.Node.InfoSection;
 import org.redisson.api.NodesGroup;
 import org.redisson.api.RFuture;
@@ -506,6 +507,8 @@ public class RedissonTest {
     public void testNode() {
         Node node = redisson.getNodesGroup().getNode(RedisRunner.getDefaultRedisServerBindAddressAndPort());
         assertThat(node).isNotNull();
+        
+        assertThat(node.info(InfoSection.ALL)).isNotEmpty();
     }
     
     @Test
@@ -644,6 +647,38 @@ public class RedissonTest {
         Assert.assertTrue(nodes.pingAll());
     }
 
+    @Test
+    public void testNodesInCluster() throws Exception {
+        RedisRunner master1 = new RedisRunner().randomPort().randomDir().nosave();
+        RedisRunner master2 = new RedisRunner().randomPort().randomDir().nosave();
+        RedisRunner master3 = new RedisRunner().randomPort().randomDir().nosave();
+        RedisRunner slot1 = new RedisRunner().randomPort().randomDir().nosave();
+        RedisRunner slot2 = new RedisRunner().randomPort().randomDir().nosave();
+        RedisRunner slot3 = new RedisRunner().randomPort().randomDir().nosave();
+        
+        ClusterRunner clusterRunner = new ClusterRunner()
+                .addNode(master1, slot1)
+                .addNode(master2, slot2)
+                .addNode(master3, slot3);
+        ClusterProcesses process = clusterRunner.run();
+        
+        Config config = new Config();
+        config.useClusterServers()
+        .setLoadBalancer(new RandomLoadBalancer())
+        .addNodeAddress(process.getNodes().stream().findAny().get().getRedisServerAddressAndPort());
+        RedissonClient redisson = Redisson.create(config);
+        
+        for (Node node : redisson.getClusterNodesGroup().getNodes()) {
+            assertThat(node.info(InfoSection.ALL)).isNotEmpty();
+        }
+        assertThat(redisson.getClusterNodesGroup().getNodes(NodeType.SLAVE)).hasSize(3);
+        assertThat(redisson.getClusterNodesGroup().getNodes(NodeType.MASTER)).hasSize(3);
+        assertThat(redisson.getClusterNodesGroup().getNodes()).hasSize(6);
+        
+        redisson.shutdown();
+        process.shutdown();
+    }
+    
     @Test
     public void testMovedRedirectInCluster() throws Exception {
         RedisRunner master1 = new RedisRunner().randomPort().randomDir().nosave();