diff --git a/e2e-tests/clustering/redis/docker-compose.yml b/e2e-tests/clustering/redis/docker-compose.yml index 9eca6a6df..e976f918f 100644 --- a/e2e-tests/clustering/redis/docker-compose.yml +++ b/e2e-tests/clustering/redis/docker-compose.yml @@ -10,14 +10,14 @@ services: - redisA command: redis-server /redis/conf/redis.conf volumes: - - "./slave/B:/redis/conf:ro" + - "./slave:/redis/conf:ro" redisC: image: *image depends_on: - redisA command: redis-server /redis/conf/redis.conf volumes: - - "./slave/C:/redis/conf:ro" + - "./slave:/redis/conf:ro" sentinelA: image: *image depends_on: diff --git a/e2e-tests/clustering/redis/sentinel/A/sentinel.conf b/e2e-tests/clustering/redis/sentinel/A/sentinel.conf index 82ba5197f..44cc6e9e4 100644 --- a/e2e-tests/clustering/redis/sentinel/A/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/A/sentinel.conf @@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes sentinel resolve-hostnames yes sentinel announce-hostnames yes -# Generated by CONFIG REWRITE - -latency-tracking-info-percentiles 50 99 99.9 -user default on nopass sanitize-payload ~* &* +@all -sentinel myid d2edd2fd2762267af463b772e543253e17b00ec9 -sentinel config-epoch mymaster 0 -sentinel leader-epoch mymaster 0 -sentinel current-epoch 0 - -sentinel known-replica mymaster 172.16.4.7 6379 - -sentinel known-sentinel mymaster 172.16.4.9 26379 acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342 - -sentinel known-sentinel mymaster 172.16.4.10 26379 bd75ae05071650f196c7ecdffb4abea1271c1e27 +# Generated by CONFIG REWRITE \ No newline at end of file diff --git a/e2e-tests/clustering/redis/sentinel/B/sentinel.conf b/e2e-tests/clustering/redis/sentinel/B/sentinel.conf index 526321f5f..44cc6e9e4 100644 --- a/e2e-tests/clustering/redis/sentinel/B/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/B/sentinel.conf @@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes sentinel resolve-hostnames yes sentinel announce-hostnames yes -# Generated by CONFIG REWRITE - -latency-tracking-info-percentiles 50 99 99.9 -user default on nopass sanitize-payload ~* &* +@all -sentinel myid acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342 -sentinel config-epoch mymaster 0 -sentinel leader-epoch mymaster 0 -sentinel current-epoch 0 - -sentinel known-replica mymaster 172.16.4.7 6379 - -sentinel known-sentinel mymaster 172.16.4.10 26379 bd75ae05071650f196c7ecdffb4abea1271c1e27 - -sentinel known-sentinel mymaster 172.16.4.8 26379 d2edd2fd2762267af463b772e543253e17b00ec9 +# Generated by CONFIG REWRITE \ No newline at end of file diff --git a/e2e-tests/clustering/redis/sentinel/C/sentinel.conf b/e2e-tests/clustering/redis/sentinel/C/sentinel.conf index d153289db..44cc6e9e4 100644 --- a/e2e-tests/clustering/redis/sentinel/C/sentinel.conf +++ b/e2e-tests/clustering/redis/sentinel/C/sentinel.conf @@ -11,17 +11,4 @@ sentinel deny-scripts-reconfig yes sentinel resolve-hostnames yes sentinel announce-hostnames yes -# Generated by CONFIG REWRITE - -latency-tracking-info-percentiles 50 99 99.9 -user default on nopass sanitize-payload ~* &* +@all -sentinel myid bd75ae05071650f196c7ecdffb4abea1271c1e27 -sentinel config-epoch mymaster 0 -sentinel leader-epoch mymaster 0 -sentinel current-epoch 0 - -sentinel known-replica mymaster 172.16.4.7 6379 - -sentinel known-sentinel mymaster 172.16.4.9 26379 acdeeaa3cb7c53bf8965ba3046d1f212ef2bd342 - -sentinel known-sentinel mymaster 172.16.4.8 26379 d2edd2fd2762267af463b772e543253e17b00ec9 +# Generated by CONFIG REWRITE \ No newline at end of file diff --git a/e2e-tests/clustering/redis/slave/C/redis.conf b/e2e-tests/clustering/redis/slave/C/redis.conf deleted file mode 100644 index d5b33cb0c..000000000 --- a/e2e-tests/clustering/redis/slave/C/redis.conf +++ /dev/null @@ -1,71 +0,0 @@ -protected-mode no -port 6379 -tcp-backlog 511 -timeout 0 -tcp-keepalive 300 -daemonize no -pidfile "/var/run/redis_6379.pid" -loglevel notice -logfile "" -databases 16 -always-show-logo no -set-proc-title yes -proc-title-template "{title} {listen-addr} {server-mode}" -stop-writes-on-bgsave-error yes -rdbcompression yes -rdbchecksum yes -dbfilename "dump.rdb" -rdb-del-sync-files no -dir "/data" -replicaof redisA 6379 -replica-serve-stale-data yes -replica-read-only yes -repl-diskless-sync yes -repl-diskless-sync-delay 5 -repl-diskless-sync-max-replicas 0 -repl-diskless-load disabled -repl-disable-tcp-nodelay no -replica-priority 100 -acllog-max-len 128 -lazyfree-lazy-eviction no -lazyfree-lazy-expire no -lazyfree-lazy-server-del no -replica-lazy-flush no -lazyfree-lazy-user-del no -lazyfree-lazy-user-flush no -oom-score-adj no -oom-score-adj-values 0 200 800 -disable-thp yes -appendonly yes -appendfilename "appendonly.aof" -appenddirname "appendonlydir" -appendfsync everysec -no-appendfsync-on-rewrite no -auto-aof-rewrite-percentage 100 -auto-aof-rewrite-min-size 64mb -aof-load-truncated yes -aof-use-rdb-preamble yes -aof-timestamp-enabled no -slowlog-log-slower-than 10000 -slowlog-max-len 128 -latency-monitor-threshold 0 -notify-keyspace-events "" -hash-max-listpack-entries 512 -hash-max-listpack-value 64 -list-max-listpack-size -2 -list-compress-depth 0 -set-max-intset-entries 512 -zset-max-listpack-entries 128 -zset-max-listpack-value 64 -hll-sparse-max-bytes 3000 -stream-node-max-bytes 4kb -stream-node-max-entries 100 -activerehashing yes -client-output-buffer-limit normal 0 0 0 -client-output-buffer-limit replica 256mb 64mb 60 -client-output-buffer-limit pubsub 32mb 8mb 60 -hz 10 -dynamic-hz yes -aof-rewrite-incremental-fsync yes -rdb-save-incremental-fsync yes -jemalloc-bg-thread yes diff --git a/e2e-tests/clustering/redis/slave/B/redis.conf b/e2e-tests/clustering/redis/slave/redis.conf similarity index 100% rename from e2e-tests/clustering/redis/slave/B/redis.conf rename to e2e-tests/clustering/redis/slave/redis.conf