Fixed - cluster topology scan shouldn't be stopped by any exception. #5857

8 months ago · 4e6c0be911
parent b607554a4a
commit 4e6c0be911
1 changed files with 13 additions and 4 deletions
--- a/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/cluster/ClusterConnectionManager.java
@ -477,11 +477,20 @@ public class ClusterConnectionManager extends MasterSlaveConnectionManager {
                        .thenCompose(r -> newPartitionsFuture)
                        .thenCompose(newPartitions -> checkSlaveNodesChange(newPartitions))
                        .thenCompose(r -> newPartitionsFuture)
-                        .thenApply(newPartitions -> {
-                            checkSlotsMigration(newPartitions);
-                            checkSlotsChange(newPartitions);
+                        .whenComplete((newPartitions, ex) -> {
+                            if (newPartitions != null) {
+                                try {
+                                    checkSlotsMigration(newPartitions);
+                                    checkSlotsChange(newPartitions);
+                                } catch (Exception exc) {
+                                    log.error(exc.getMessage(), exc);
+                                }
+                            }
+                            if (ex != null) {
+                                log.error(ex.getMessage(), ex);
+                            }
+
                            scheduleClusterChangeCheck(cfg);
-                            return newPartitions;
                        });
        });
    }