test: fix envoy settings for bench (#121)

Author: supercaracal

compose.latency.yaml

@@ -37,7 +37,7 @@ services:
       bash -c "apt-get update > /dev/null
       && apt-get install --no-install-recommends --no-install-suggests -y iproute2 iputils-ping > /dev/null
       && rm -rf /var/lib/apt/lists/*
-      && tc qdisc add dev eth0 root netem delay ${DELAY_TIME:-20ms}
+      && (tc qdisc add dev eth0 root netem delay ${DELAY_TIME:-20ms} || echo skipped)
       && redis-server
       --maxmemory            64mb
       --maxmemory-policy     allkeys-lru
@@ -101,9 +101,11 @@ services:
         condition: service_healthy
       node9:
         condition: service_healthy
-  envoy:
+  proxy:
     image: envoyproxy/envoy:v1.23.1
+    restart: "${RESTART_POLICY:-always}"
     ports:
+      - "3000:10000"
       - "7000:10001"
     volumes:
       - ./test/proxy/envoy.yaml:/etc/envoy/envoy.yaml

test/bench_command.rb

@@ -97,7 +97,7 @@ def bench_pipeline_echo
     private
 
     def new_test_client
-      ::RedisClient.config(**TEST_GENERIC_OPTIONS.merge(port: 7000, protocol: 2)).new_client
+      ::RedisClient.config(**TEST_GENERIC_OPTIONS.merge(BENCH_PROXY_OPTIONS)).new_client
     end
 
     def new_cluster_client

test/proxy/envoy.yaml

@@ -5,7 +5,6 @@
 admin:
   address:
     socket_address: 
-      protocol: TCP
       address: 0.0.0.0
       port_value: 10000
 static_resources:
@@ -49,3 +48,9 @@ static_resources:
       endpoints:
       - lb_endpoints:
         - endpoint: { address: { socket_address: { address: node1, port_value: 6379 } } }
+layered_runtime:
+  layers:
+    - name: redis
+      static_layer:
+        overload:
+          global_downstream_max_connections: 100

test/testing_constants.rb

@@ -63,4 +63,6 @@
 TEST_REDIS_MAJOR_VERSION = Integer(TEST_REDIS_VERSION.split('.').first)
 _tmp_cli.close
 
+BENCH_PROXY_OPTIONS = { port: 7000, protocol: 2 }.freeze
+
 # rubocop:enable Lint/UnderscorePrefixedVariableName