- Fix redis_replicat test for unused option defaults and log printout.

diff --git a/doc/Changelog b/doc/Changelog
index 301d53f8a2e5251d23adfb2bc4aed9f1945edc31..c90a1dd1da6ee15336acc6e6d7d9e5231e102e9c 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -2,6 +2,7 @@
        - Fix mesh_copy_client_info to omit null contents from copy.
        - Fix comment name in the rpz nsdname test.
        - Fix nettle compile for warnings and ticket keys.
+       - Fix redis_replicat test for unused option defaults and log printout.
 
 3 April 2025: Wouter
        - Fix #1263: Exempt loopback addresses from wait-limit.

diff --git a/testdata/redis_replica.tdir/redis.conf b/testdata/redis_replica.tdir/redis.conf
index 20a3133f89f9236c370f848c5b42e9fe2fb9e1f5..3b80736e2438e11545edfc08bfba8d45b2e7207a 100644 (file)
--- a/testdata/redis_replica.tdir/redis.conf
+++ b/testdata/redis_replica.tdir/redis.conf
@@ -120,7 +120,7 @@ proc-title-template "{title} {listen-addr} {server-mode}"
 # Set the local environment which is used for string comparison operations, and
 # also affect the performance of Lua scripts. Empty String indicates the locale
 # is derived from the environment variables.
-locale-collate ""
+#locale-collate ""
 
 # By default Redis will stop accepting writes if RDB snapshots are enabled
 # (at least one save point) and the latest background save failed.
@@ -245,7 +245,7 @@ repl-diskless-sync-delay 5
 # the replication start before the maximum delay is reached if the maximum
 # number of replicas expected have connected. Default of 0 means that the
 # maximum is not defined and Redis will wait the full delay.
-repl-diskless-sync-max-replicas 0
+#repl-diskless-sync-max-replicas 0
 
 # -----------------------------------------------------------------------------
 # WARNING: Since in this setup the replica does not immediately store an RDB on
@@ -434,8 +434,8 @@ notify-keyspace-events ""
 # Hashes are encoded using a memory efficient data structure when they have a
 # small number of entries, and the biggest entry does not exceed a given
 # threshold. These thresholds can be configured using the following directives.
-hash-max-listpack-entries 512
-hash-max-listpack-value 64
+#hash-max-listpack-entries 512
+#hash-max-listpack-value 64
 
 # Lists are also encoded in a special way to save a lot of space.
 # The number of entries allowed per internal list node can be specified
@@ -450,7 +450,7 @@ hash-max-listpack-value 64
 # per list node.
 # The highest performing option is usually -2 (8 Kb size) or -1 (4 Kb size),
 # but if your use case is unique, adjust the settings as necessary.
-list-max-listpack-size -2
+#list-max-listpack-size -2
 
 # Lists may also be compressed.
 # Compress depth is the number of quicklist ziplist nodes from *each* side of
@@ -479,14 +479,14 @@ set-max-intset-entries 512
 # data structure when they have a small number of entries, and the biggest entry
 # does not exceed a given threshold. These thresholds can be configured using
 # the following directives.
-set-max-listpack-entries 128
-set-max-listpack-value 64
+#set-max-listpack-entries 128
+#set-max-listpack-value 64
 
 # Similarly to hashes and lists, sorted sets are also specially encoded in
 # order to save a lot of space. This encoding is only used when the length and
 # elements of a sorted set are below the following limits:
-zset-max-listpack-entries 128
-zset-max-listpack-value 64
+#zset-max-listpack-entries 128
+#zset-max-listpack-value 64
 
 # HyperLogLog sparse representation bytes limit. The limit includes the
 # 16 bytes header. When a HyperLogLog using the sparse representation crosses

diff --git a/testdata/redis_replica.tdir/redis_replica.post b/testdata/redis_replica.tdir/redis_replica.post
index afb41f19fbbba0bde12fdad0eaaea987fce6b036..35f11651808f3848fb1b37af5e82ab74b5454c3e 100644 (file)
--- a/testdata/redis_replica.tdir/redis_replica.post
+++ b/testdata/redis_replica.tdir/redis_replica.post
@@ -9,3 +9,10 @@
 kill_pid $REDIS_PID
 kill_pid $REDIS_REPLICA_PID
 kill_pid $UNBOUND_PID
+echo "> cat logfiles"
+echo "redis server.log"
+cat server.log
+echo "redis replica.log"
+cat replica.log
+echo "unbound.log"
+cat unbound.log

diff --git a/testdata/redis_replica.tdir/redis_replica.test b/testdata/redis_replica.tdir/redis_replica.test
index c3e141dd926e80c5aecaac7dd8b1b7d248d3aaf6..a9f15b8094f8ca24c5d9f3631e68cb5b764886d0 100644 (file)
--- a/testdata/redis_replica.tdir/redis_replica.test
+++ b/testdata/redis_replica.tdir/redis_replica.test
@@ -74,7 +74,5 @@ redis_cli_check_keys $REDIS_SOCKET 1
 # check Redis replica server has no keys
 redis_cli_check_keys $REDIS_REPLICA_SOCKET 0
 
-echo "> cat logfiles"
-cat unbound.log
 echo "> OK"
 exit 0