Addressed last bunch of comments from Ali, changed ports to not colid…

…e with existing infra
redis · Sep 24, 2024 · 96b7674 · 96b7674
1 parent ac2b689
commit 96b7674
Show file tree

Hide file tree

Showing 21 changed files with 119 additions and 104 deletions.
diff --git a/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java b/src/main/java/io/lettuce/core/cluster/RedisAdvancedClusterAsyncCommandsImpl.java
@@ -403,6 +403,7 @@ public RedisFuture<Long> mget(KeyValueStreamingChannel<K, V> channel, Iterable<K
     @Override
     public RedisFuture<String> jsonMSet(List<JsonMsetArgs<K, V>> arguments) {
         List<K> keys = arguments.stream().map(JsonMsetArgs::getKey).collect(Collectors.toList());
+        Map<K, List<JsonMsetArgs<K, V>>> argsPerKey = arguments.stream().collect(Collectors.groupingBy(JsonMsetArgs::getKey));
         Map<Integer, List<K>> partitioned = SlotHash.partition(codec, keys);
 
         if (partitioned.size() < 2) {
@@ -412,11 +413,12 @@ public RedisFuture<String> jsonMSet(List<JsonMsetArgs<K, V>> arguments) {
         Map<Integer, RedisFuture<String>> executions = new HashMap<>();
 
         for (Map.Entry<Integer, List<K>> entry : partitioned.entrySet()) {
-            entry.getValue().forEach(k -> {
-                RedisFuture<String> mset = super.jsonMSet(
-                        arguments.stream().filter(args -> args.getKey().equals(k)).collect(Collectors.toList()));
-                executions.put(entry.getKey(), mset);
-            });
+
+            List<JsonMsetArgs<K, V>> op = new ArrayList<>();
+            entry.getValue().forEach(k -> op.addAll(argsPerKey.get(k)));
+
+            RedisFuture<String> mset = super.jsonMSet(op);
+            executions.put(entry.getKey(), mset);
         }
 
         return MultiNodeExecution.firstOfAsync(executions);

diff --git a/src/main/java/io/lettuce/core/json/UnproccessedJsonValue.java b/src/main/java/io/lettuce/core/json/UnproccessedJsonValue.java
@@ -45,9 +45,15 @@ public String toValue() {
             return jsonValue.toValue();
         }
 
-        // if no deserialization took place, so no modification took place
-        // in this case we can decode the source data as is
-        return StringCodec.UTF8.decodeValue(unprocessedData);
+        synchronized (this) {
+            if (isDeserialized()) {
+                return jsonValue.toValue();
+            }
+
+            // if no deserialization took place, so no modification took place
+            // in this case we can decode the source data as is
+            return StringCodec.UTF8.decodeValue(unprocessedData);
+        }
     }
 
     @Override
@@ -56,9 +62,15 @@ public ByteBuffer asByteBuffer() {
             return jsonValue.asByteBuffer();
         }
 
-        // if no deserialization took place, so no modification took place
-        // in this case we can decode the source data as is
-        return unprocessedData;
+        synchronized (this) {
+            if (isDeserialized()) {
+                return jsonValue.asByteBuffer();
+            }
+
+            // if no deserialization took place, so no modification took place
+            // in this case we can decode the source data as is
+            return unprocessedData;
+        }
     }
 
     @Override

diff --git a/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonClusterIntegrationTests.java
@@ -39,7 +39,7 @@ public class RedisJsonClusterIntegrationTests extends RedisContainerIntegrationT
     protected static RedisAdvancedClusterCommands<String, String> redis;
 
     public RedisJsonClusterIntegrationTests() {
-        RedisURI redisURI = RedisURI.Builder.redis("127.0.0.1").withPort(26379).build();
+        RedisURI redisURI = RedisURI.Builder.redis("127.0.0.1").withPort(36379).build();
 
         client = RedisClusterClient.create(redisURI);
         redis = client.connect().sync();

diff --git a/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java b/src/test/java/io/lettuce/core/json/RedisJsonIntegrationTests.java
@@ -9,6 +9,7 @@
 
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.RedisClient;
+import io.lettuce.core.RedisContainerIntegrationTests;
 import io.lettuce.core.RedisFuture;
 import io.lettuce.core.RedisURI;
 import io.lettuce.core.api.StatefulRedisConnection;
@@ -36,7 +37,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class RedisJsonIntegrationTests { // extends RedisContainerIntegrationTests {
+public class RedisJsonIntegrationTests extends RedisContainerIntegrationTests {
 
     private static final String BIKES_INVENTORY = "bikes:inventory";
 

diff --git a/src/test/resources/docker/Dockerfile b/src/test/resources/docker/Dockerfile
@@ -1,20 +1,20 @@
 FROM redis/redis-stack:latest
 
-RUN mkdir -p /nodes/26379 /nodes/26380 /nodes/26381 /nodes/26382 /nodes/26383 /nodes/26384
+RUN mkdir -p /nodes/36379 /nodes/36380 /nodes/36381 /nodes/36382 /nodes/36383 /nodes/36384
 
-COPY cluster-nodes/nodes-26379.conf /nodes/26379/nodes.conf
-COPY cluster-nodes/nodes-26380.conf /nodes/26380/nodes.conf
-COPY cluster-nodes/nodes-26381.conf /nodes/26381/nodes.conf
-COPY cluster-nodes/nodes-26382.conf /nodes/26382/nodes.conf
-COPY cluster-nodes/nodes-26383.conf /nodes/26383/nodes.conf
-COPY cluster-nodes/nodes-26384.conf /nodes/26384/nodes.conf
+COPY cluster-nodes/nodes-36379.conf /nodes/36379/nodes.conf
+COPY cluster-nodes/nodes-36380.conf /nodes/36380/nodes.conf
+COPY cluster-nodes/nodes-36381.conf /nodes/36381/nodes.conf
+COPY cluster-nodes/nodes-36382.conf /nodes/36382/nodes.conf
+COPY cluster-nodes/nodes-36383.conf /nodes/36383/nodes.conf
+COPY cluster-nodes/nodes-36384.conf /nodes/36384/nodes.conf
 
-COPY cluster-nodes/redis-26379.conf /nodes/26379/redis.conf
-COPY cluster-nodes/redis-26380.conf /nodes/26380/redis.conf
-COPY cluster-nodes/redis-26381.conf /nodes/26381/redis.conf
-COPY cluster-nodes/redis-26382.conf /nodes/26382/redis.conf
-COPY cluster-nodes/redis-26383.conf /nodes/26383/redis.conf
-COPY cluster-nodes/redis-26384.conf /nodes/26384/redis.conf
+COPY cluster-nodes/redis-36379.conf /nodes/36379/redis.conf
+COPY cluster-nodes/redis-36380.conf /nodes/36380/redis.conf
+COPY cluster-nodes/redis-36381.conf /nodes/36381/redis.conf
+COPY cluster-nodes/redis-36382.conf /nodes/36382/redis.conf
+COPY cluster-nodes/redis-36383.conf /nodes/36383/redis.conf
+COPY cluster-nodes/redis-36384.conf /nodes/36384/redis.conf
 
 COPY start_cluster.sh /start_cluster.sh
 

diff --git a/...ces/docker/cluster-nodes/nodes-26379.conf → ...ces/docker/cluster-nodes/nodes-36379.conf b/...ces/docker/cluster-nodes/nodes-26379.conf → ...ces/docker/cluster-nodes/nodes-36379.conf
@@ -1,7 +1,7 @@
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170931 3 connected 10923-16383
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 1724417171949 1724417168901 1 connected
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417170000 2 connected
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,master - 0 1724417168000 1 connected 0-5460
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170931 3 connected 10923-16383
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 1724417171949 1724417168901 1 connected
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417170000 2 connected
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,master - 0 1724417168000 1 connected 0-5460
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/...ces/docker/cluster-nodes/nodes-26380.conf → ...ces/docker/cluster-nodes/nodes-36380.conf b/...ces/docker/cluster-nodes/nodes-26380.conf → ...ces/docker/cluster-nodes/nodes-36380.conf
@@ -1,7 +1,7 @@
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,master - 0 1724417169000 2 connected 5461-10922
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170930 3 connected 10923-16383
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168901 1 connected
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,master - 0 1724417169000 2 connected 5461-10922
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417170930 3 connected 10923-16383
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168901 1 connected
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/...ces/docker/cluster-nodes/nodes-26381.conf → ...ces/docker/cluster-nodes/nodes-36381.conf b/...ces/docker/cluster-nodes/nodes-26381.conf → ...ces/docker/cluster-nodes/nodes-36381.conf
@@ -1,7 +1,7 @@
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,master - 0 1724417166000 3 connected 10923-16383
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417168901 1 connected 0-5460
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417169916 2 connected 5461-10922
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417167000 3 connected
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167171 2 connected
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,master - 0 1724417166000 3 connected 10923-16383
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417168901 1 connected 0-5460
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417169916 2 connected 5461-10922
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417167000 3 connected
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/...ces/docker/cluster-nodes/nodes-26382.conf → ...ces/docker/cluster-nodes/nodes-36382.conf b/...ces/docker/cluster-nodes/nodes-26382.conf → ...ces/docker/cluster-nodes/nodes-36382.conf
@@ -1,7 +1,7 @@
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171948 2 connected
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171000 3 connected 10923-16383
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417170931 1 connected 0-5460
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417172965 1724417168902 2 connected 5461-10922
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171948 2 connected
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171000 3 connected 10923-16383
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee myself,slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169000 3 connected
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417170931 1 connected 0-5460
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417172965 1724417168902 2 connected 5461-10922
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/...ces/docker/cluster-nodes/nodes-26383.conf → ...ces/docker/cluster-nodes/nodes-36383.conf b/...ces/docker/cluster-nodes/nodes-26383.conf → ...ces/docker/cluster-nodes/nodes-36383.conf
@@ -1,7 +1,7 @@
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417171000 1 connected 0-5460
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171000 2 connected
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171949 3 connected 10923-16383
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417172966 3 connected
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 0 1724417170000 2 connected 5461-10922
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417171000 1 connected 0-5460
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417171000 2 connected
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417171949 3 connected 10923-16383
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 myself,slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417168000 1 connected
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417172966 3 connected
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/...ces/docker/cluster-nodes/nodes-26384.conf → ...ces/docker/cluster-nodes/nodes-36384.conf b/...ces/docker/cluster-nodes/nodes-26384.conf → ...ces/docker/cluster-nodes/nodes-36384.conf
@@ -1,7 +1,7 @@
-3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:26379@36379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460
-916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:26383@36383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417166981 1 connected
-2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:26381@36381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417168903 3 connected 10923-16383
-024a891ec46aeded14511b7c5899460198306353 127.0.0.1:26384@36384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167000 2 connected
-a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:26382@36382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected
-72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:26380@36380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417170930 1724417167000 2 connected 5461-10922
+3c5ae3144eb30caa272796173d3d8b314d881b51 127.0.0.1:36379@46379,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 master - 0 1724417169000 1 connected 0-5460
+916a157a7772af418664b6b2c7feeede5e1851dd 127.0.0.1:36383@46383,,tls-port=0,shard-id=d0fa2e52119c2ce8e260d5055b7a8315cbf81532 slave 3c5ae3144eb30caa272796173d3d8b314d881b51 0 1724417166981 1 connected
+2ece6db60f8e5665c140c89720d3d259c024d179 127.0.0.1:36381@46381,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee master - 0 1724417168903 3 connected 10923-16383
+024a891ec46aeded14511b7c5899460198306353 127.0.0.1:36384@46384,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 myself,slave 72d77afa00d3572b7fcb0215181bb46b3e869c42 0 1724417167000 2 connected
+a7ff9d3ed43a7ff58485c4e780f86c4202b8224f 127.0.0.1:36382@46382,,tls-port=0,shard-id=6503ed475afaa96064f49a64e6125eac5cfa3fee slave 2ece6db60f8e5665c140c89720d3d259c024d179 0 1724417169917 3 connected
+72d77afa00d3572b7fcb0215181bb46b3e869c42 127.0.0.1:36380@46380,,tls-port=0,shard-id=b267b10ea7526c233843e3a4c165d97cb7da54b5 master - 1724417170930 1724417167000 2 connected 5461-10922
 vars currentEpoch 6 lastVoteEpoch 0
diff --git a/src/test/resources/docker/cluster-nodes/redis-26383.conf b/src/test/resources/docker/cluster-nodes/redis-26383.conf