fix: a docker compose file for NAT-ted environments (#100)

Author: supercaracal

docker-compose.nat.yaml

@@ -1,6 +1,7 @@
 ---
-# REDIS_HOST=192.168.11.9 docker compose -f docker-compose.nat.yaml up
-# REDIS_HOST=192.168.11.7 docker compose -f docker-compose.nat.yaml up
+# First things first, make sure the default-address-pools settings in /etc/docker/daemon.json
+# HOST_ADDR=192.168.11.9 docker compose -f docker-compose.nat.yaml up
+# HOST_ADDR=192.168.11.7 docker compose -f docker-compose.nat.yaml up
 # bundle exec rake 'build_cluster[192.168.11.9,192.168.11.7]'
 services:
   node1: &node
@@ -10,10 +11,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6379
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6379
       --cluster-announce-bus-port 16379
     restart: "${RESTART_POLICY:-always}"
@@ -32,10 +35,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6380
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6380
       --cluster-announce-bus-port 16380
     ports:
@@ -48,10 +53,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6381
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6381
       --cluster-announce-bus-port 16381
     ports:
@@ -64,10 +71,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6382
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6382
       --cluster-announce-bus-port 16382
     ports:
@@ -80,10 +89,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6383
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6383
       --cluster-announce-bus-port 16383
     ports:
@@ -96,10 +107,12 @@ services:
       --maxmemory                 64mb
       --maxmemory-policy          allkeys-lru
       --appendonly                yes
+      --replica-announce-ip       "${HOST_ADDR:-127.0.0.1}"
+      --replica-announce-port     6384
       --cluster-enabled           yes
       --cluster-config-file       nodes.conf
-      --cluster-node-timeout      30000
-      --cluster-announce-ip       "${REDIS_HOST:-127.0.0.1}"
+      --cluster-node-timeout      10000
+      --cluster-announce-ip       "${HOST_ADDR:-127.0.0.1}"
       --cluster-announce-port     6384
       --cluster-announce-bus-port 16384
     ports:

test/cluster_controller.rb

@@ -298,9 +298,10 @@ def replicate(clients, shard_size:, replica_size:)
             replica.call('CLUSTER', 'REPLICATE', primary_id)
             print_debug("#{replica.config.host}:#{replica.config.port} ... CLUSTER REPLICATE #{primaries[i].config.host}:#{primaries[i].config.port}")
           end
-        rescue ::RedisClient::CommandError
-          # ERR Unknown node [key]
-          sleep 0.1
+        rescue ::RedisClient::CommandError => e
+          print_debug(e.message)
+          # ERR Unknown node [node-id]
+          sleep 1.0
           primary_id = primaries[i].call('CLUSTER', 'MYID')
           next
         end