Use computation thread pool for getNodeSpecificViews redis#2045

Original pull request: redis#2048.
GilboaAWS · Apr 3, 2022 · 3035c3d · 3035c3d
1 parent 7fe8c36
commit 3035c3d
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java b/src/main/java/io/lettuce/core/cluster/topology/DefaultClusterTopologyRefresh.java
@@ -105,10 +105,8 @@ public CompletionStage<Map<RedisURI, Partitions>> loadViews(Iterable<RedisURI> s
             Requests requestedTopology = connections.requestTopology(commandTimeoutNs, TimeUnit.NANOSECONDS);
             Requests requestedInfo = connections.requestInfo(commandTimeoutNs, TimeUnit.NANOSECONDS);
             return CompletableFuture.allOf(requestedTopology.allCompleted(), requestedInfo.allCompleted())
-                    .thenCompose(ignore -> {
-
-                        NodeTopologyViews views = getNodeSpecificViews(requestedTopology, requestedInfo);
-
+                    .thenCompose(ignore -> getNodeSpecificViewsAsync(requestedTopology, requestedInfo))
+                    .thenCompose(views -> {
                         if (discovery && isEventLoopActive()) {
 
                             Set<RedisURI> allKnownUris = views.getClusterNodes();
@@ -130,10 +128,7 @@ public CompletionStage<Map<RedisURI, Partitions>> loadViews(Iterable<RedisURI> s
                                         .requestInfo(commandTimeoutNs, TimeUnit.NANOSECONDS).mergeWith(requestedInfo);
                                 return CompletableFuture
                                         .allOf(additionalTopology.allCompleted(), additionalClients.allCompleted())
-                                        .thenApply(ignore2 -> {
-
-                                            return getNodeSpecificViews(additionalTopology, additionalClients);
-                                        });
+                                        .thenCompose(ignore2 -> getNodeSpecificViewsAsync(additionalTopology, additionalClients));
                             });
                         }
 
@@ -286,6 +281,13 @@ NodeTopologyViews getNodeSpecificViews(Requests requestedTopology, Requests requ
         return new NodeTopologyViews(views);
     }
 
+    private CompletableFuture<NodeTopologyViews> getNodeSpecificViewsAsync(Requests requestedTopology, Requests requestedInfo) {
+        // use computation thread pool
+        // ref: https://github.com/lettuce-io/lettuce-core/issues/2045
+        return CompletableFuture.supplyAsync(() -> getNodeSpecificViews(requestedTopology, requestedInfo),
+                clientResources.eventExecutorGroup());
+    }
+
     private static boolean validNode(RedisClusterNode redisClusterNode) {
 
         if (redisClusterNode.is(RedisClusterNode.NodeFlag.NOADDR)) {