From dd2943aa9bf99afb2688938bb3f3046c7380c0fe Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Sun, 11 Feb 2024 18:53:39 +0000 Subject: [PATCH 1/5] Revert regex change. Update fixtures. --- internal/stages_test.go | 2 +- internal/test_helpers/fixtures/expiry/pass | 6 +-- internal/test_helpers/fixtures/ping-pong/eof | 2 +- .../test_helpers/fixtures/rdb-config/pass | 8 ++-- .../test_helpers/fixtures/rdb-read-key/pass | 10 ++-- .../fixtures/rdb-read-multiple-keys/pass | 14 +++--- .../rdb-read-multiple-string-values/pass | 16 +++---- .../fixtures/rdb-read-value-with-expiry/pass | 18 ++++---- .../fixtures/rdb-string-value/pass | 12 ++--- .../fixtures/repl-cmd-processing/pass | 30 ++++++------ .../fixtures/repl-custom-port/pass | 18 ++++---- internal/test_helpers/fixtures/repl-id/pass | 18 ++++---- .../fixtures/repl-info-replica/pass | 18 ++++---- internal/test_helpers/fixtures/repl-info/pass | 18 ++++---- .../fixtures/repl-master-cmd-prop/pass | 24 +++++----- .../fixtures/repl-master-psync-rdb/pass | 22 ++++----- .../fixtures/repl-master-psync/pass | 20 ++++---- .../fixtures/repl-master-replconf/pass | 18 ++++---- .../fixtures/repl-multiple-replicas/pass | 30 ++++++------ .../fixtures/repl-replica-getack-nonzero/pass | 30 ++++++------ .../fixtures/repl-replica-getack/pass | 30 ++++++------ .../fixtures/repl-replica-ping/pass | 18 ++++---- .../fixtures/repl-replica-psync/pass | 18 ++++---- .../fixtures/repl-replica-replconf/pass | 18 ++++---- .../fixtures/repl-wait-zero-offset/pass | 40 ++++++++-------- .../fixtures/repl-wait-zero-replicas/pass | 30 ++++++------ internal/test_helpers/fixtures/repl-wait/pass | 46 +++++++++---------- 27 files changed, 267 insertions(+), 267 deletions(-) diff --git a/internal/stages_test.go b/internal/stages_test.go index b8d94cb9..6d131a62 100644 --- a/internal/stages_test.go +++ b/internal/stages_test.go @@ -239,7 +239,7 @@ func normalizeTesterOutput(testerOutput []byte) []byte { "tcp_port": {regexp.MustCompile("read tcp 127.0.0.1:\\d+->127.0.0.1:6379: read: connection reset by peer")}, " tmp_dir ": {regexp.MustCompile(" /private/var/folders/[^ ]+ "), regexp.MustCompile(" /tmp/[^ ]+ ")}, "timestamp": {regexp.MustCompile("\\d{2}:\\d{2}:\\d{2}\\.\\d{3}")}, - "replication_id": {regexp.MustCompile(".*FULLRESYNC [A-Za-z0-9]+ 0 received.")}, + "replication_id": {regexp.MustCompile("FULLRESYNC [A-Za-z0-9]+ 0 received.")}, "wait_timeout": {regexp.MustCompile("WAIT command returned after [0-9]+ ms")}, } diff --git a/internal/test_helpers/fixtures/expiry/pass b/internal/test_helpers/fixtures/expiry/pass index 8843d927..e3e0cb19 100644 --- a/internal/test_helpers/fixtures/expiry/pass +++ b/internal/test_helpers/fixtures/expiry/pass @@ -69,11 +69,11 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:26:05.673) -[stage-7] $ redis-cli get grapes (sent at 16:26:05.673, key should not be expired) +[stage-7] Received OK (at 17:50:51.530) +[stage-7] $ redis-cli get grapes (sent at 17:50:51.530, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:26:05.774, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:50:51.632, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully diff --git a/internal/test_helpers/fixtures/ping-pong/eof b/internal/test_helpers/fixtures/ping-pong/eof index 455dd3da..b944c187 100644 --- a/internal/test_helpers/fixtures/ping-pong/eof +++ b/internal/test_helpers/fixtures/ping-pong/eof @@ -16,7 +16,7 @@ Debug = true [stage-2] $ redis-cli ping [stage-2] Reading response... [stage-2] Hint: 'connection reset by peer' usually means that your program closed the connection before sending a complete response. -[stage-2] read tcp 127.0.0.1:47322->127.0.0.1:6379: read: connection reset by peer +[stage-2] read tcp 127.0.0.1:59976->127.0.0.1:6379: read: connection reset by peer [stage-2] Test failed [stage-2] Terminating program [stage-2] Program terminated successfully diff --git a/internal/test_helpers/fixtures/rdb-config/pass b/internal/test_helpers/fixtures/rdb-config/pass index 623619dd..66452914 100644 --- a/internal/test_helpers/fixtures/rdb-config/pass +++ b/internal/test_helpers/fixtures/rdb-config/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:27:33.853) -[stage-7] $ redis-cli get grapes (sent at 16:27:33.853, key should not be expired) +[stage-7] Received OK (at 17:46:35.525) +[stage-7] $ redis-cli get grapes (sent at 17:46:35.525, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:27:33.954, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:46:35.627, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4245072751 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3182181644 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-key/pass b/internal/test_helpers/fixtures/rdb-read-key/pass index eb54df52..18ca3a49 100644 --- a/internal/test_helpers/fixtures/rdb-read-key/pass +++ b/internal/test_helpers/fixtures/rdb-read-key/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:32:15.892) -[stage-7] $ redis-cli get grapes (sent at 16:32:15.892, key should not be expired) +[stage-7] Received OK (at 17:46:04.792) +[stage-7] $ redis-cli get grapes (sent at 17:46:04.792, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:32:15.993, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:46:04.893, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3880749550 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2243917711 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4179904341 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3306017459 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass b/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass index 75cb2cf6..c8b07d3b 100644 --- a/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass +++ b/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:27:38.910) -[stage-7] $ redis-cli get grapes (sent at 16:27:38.910, key should not be expired) +[stage-7] Received OK (at 17:46:49.838) +[stage-7] $ redis-cli get grapes (sent at 17:46:49.838, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:27:39.012, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:46:49.939, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2385476531 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1267355796 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles537073336 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles541287302 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3077309834 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3173847821 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3755854538 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4046061762 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass b/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass index a1710770..d4939ccd 100644 --- a/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass +++ b/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:26:11.736) -[stage-7] $ redis-cli get grapes (sent at 16:26:11.736, key should not be expired) +[stage-7] Received OK (at 17:50:54.484) +[stage-7] $ redis-cli get grapes (sent at 17:50:54.484, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:26:11.838, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:50:54.585, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3200217314 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2711934345 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3726916059 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3034196230 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles514194738 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1569058598 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles418699697 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles897471162 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1938215963 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles7429286 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape diff --git a/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass b/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass index fbeb926a..2a48f683 100644 --- a/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass +++ b/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:26:25.205) -[stage-7] $ redis-cli get grapes (sent at 16:26:25.205, key should not be expired) +[stage-7] Received OK (at 17:49:05.328) +[stage-7] $ redis-cli get grapes (sent at 17:49:05.328, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:26:25.307, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:49:05.430, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4038037800 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1552243124 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles817889673 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1002264537 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3156628814 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles896246511 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles189452306 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3832849681 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles486173548 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4246796746 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2461329809 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3430211170 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/rdb-string-value/pass b/internal/test_helpers/fixtures/rdb-string-value/pass index 16d05dd6..4a096fc0 100644 --- a/internal/test_helpers/fixtures/rdb-string-value/pass +++ b/internal/test_helpers/fixtures/rdb-string-value/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:25:39.794) -[stage-7] $ redis-cli get grapes (sent at 16:25:39.794, key should not be expired) +[stage-7] Received OK (at 17:46:40.577) +[stage-7] $ redis-cli get grapes (sent at 17:46:40.577, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:25:39.895, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:46:40.678, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3309788375 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3946266756 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3558757520 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1496371479 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2982602036 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3554182541 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program diff --git a/internal/test_helpers/fixtures/repl-cmd-processing/pass b/internal/test_helpers/fixtures/repl-cmd-processing/pass index 3c4cb3bd..69d74bf6 100644 --- a/internal/test_helpers/fixtures/repl-cmd-processing/pass +++ b/internal/test_helpers/fixtures/repl-cmd-processing/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:27:14.800) -[stage-7] $ redis-cli get grapes (sent at 16:27:14.800, key should not be expired) +[stage-7] Received OK (at 17:49:37.776) +[stage-7] $ redis-cli get grapes (sent at 17:49:37.776, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:27:14.902, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:49:37.877, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2585431942 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2506569173 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles795095690 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles236749854 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3188313527 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2771015094 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1098810603 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3411227736 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles31920035 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles98052258 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles549103665 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1121234224 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 414e6885c92253e84e39eab7536cb2b5df0ef0ff 0 received. +[stage-22] FULLRESYNC d467595f17fecd5a5c73a990022b93ae039d8e60 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 86b7884b574f87dbc2d44589d9dc70ac70ca1e14 0 received. +[stage-23] FULLRESYNC 98f7c9d581f7f22040f681ffe8c2c47872972942 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC ce1271bd597edd555c721b3e92b635a3ea6724c5 0 received. +[stage-24] FULLRESYNC 784d03bf29fdf6ffa5d20d3349f9293343d797e3 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 0 received. +[stage-25] [replica-1] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 0 received. +[stage-25] [replica-2] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 0 received. +[stage-25] [replica-3] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-custom-port/pass b/internal/test_helpers/fixtures/repl-custom-port/pass index 7f404494..1057c1b0 100644 --- a/internal/test_helpers/fixtures/repl-custom-port/pass +++ b/internal/test_helpers/fixtures/repl-custom-port/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:25:49.052) -[stage-7] $ redis-cli get grapes (sent at 16:25:49.052, key should not be expired) +[stage-7] Received OK (at 17:50:16.005) +[stage-7] $ redis-cli get grapes (sent at 17:50:16.005, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:25:49.153, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:50:16.106, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4011913093 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1350693201 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles821574099 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3095446568 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3739119394 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1072810271 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2033357338 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785573142 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3769079571 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2346882724 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2255566758 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1454348777 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-id/pass b/internal/test_helpers/fixtures/repl-id/pass index 6f40e4ee..93397ee1 100644 --- a/internal/test_helpers/fixtures/repl-id/pass +++ b/internal/test_helpers/fixtures/repl-id/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:25:22.771) -[stage-7] $ redis-cli get grapes (sent at 16:25:22.771, key should not be expired) +[stage-7] Received OK (at 17:44:24.572) +[stage-7] $ redis-cli get grapes (sent at 17:44:24.572, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:25:22.872, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:44:24.673, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3287183874 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2026176341 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1045973770 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3209625356 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2180453928 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2339284321 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3310792369 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1498713790 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles399624370 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles533475082 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2320476593 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785418251 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-info-replica/pass b/internal/test_helpers/fixtures/repl-info-replica/pass index 1200c6b1..d2ffee54 100644 --- a/internal/test_helpers/fixtures/repl-info-replica/pass +++ b/internal/test_helpers/fixtures/repl-info-replica/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:27:50.279) -[stage-7] $ redis-cli get grapes (sent at 16:27:50.279, key should not be expired) +[stage-7] Received OK (at 17:49:20.898) +[stage-7] $ redis-cli get grapes (sent at 17:49:20.898, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:27:50.380, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:49:21.000, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3414732450 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2311973092 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles706872412 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3897694714 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1215146242 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2204841688 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2347342152 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles744882673 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3159280433 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2409265119 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3953673255 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles532192595 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-info/pass b/internal/test_helpers/fixtures/repl-info/pass index a9500690..58d81b98 100644 --- a/internal/test_helpers/fixtures/repl-info/pass +++ b/internal/test_helpers/fixtures/repl-info/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:26:40.770) -[stage-7] $ redis-cli get grapes (sent at 16:26:40.770, key should not be expired) +[stage-7] Received OK (at 17:44:07.824) +[stage-7] $ redis-cli get grapes (sent at 17:44:07.824, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:26:40.871, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:44:07.925, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4276800343 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2300305845 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1012990278 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3144401646 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2489881793 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1679942134 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2286863220 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1899737430 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1737277580 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3541167380 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles700916809 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2402082845 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-master-cmd-prop/pass b/internal/test_helpers/fixtures/repl-master-cmd-prop/pass index a2fc134b..86a07a86 100644 --- a/internal/test_helpers/fixtures/repl-master-cmd-prop/pass +++ b/internal/test_helpers/fixtures/repl-master-cmd-prop/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:31:42.510) -[stage-7] $ redis-cli get grapes (sent at 16:31:42.510, key should not be expired) +[stage-7] Received OK (at 17:44:58.986) +[stage-7] $ redis-cli get grapes (sent at 17:44:58.986, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:31:42.611, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:44:59.088, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles815388135 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3503127609 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4154065145 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles251196775 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3275451732 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1629576457 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1339209009 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3915321183 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1492443661 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2050038889 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1207320348 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3360379599 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 2cf81b3854faa6a2e91163a0d5721cdd67d38889 0 received. +[stage-22] FULLRESYNC d09961bfa684b447d927a9a28b33c9c906ee642a 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC fb742417a37f2b78fffe312df4be6dabf9a74c99 0 received. +[stage-23] FULLRESYNC 569cddc72d7395761f376d958dd97507639c2a44 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC b524bba3aa570ccfb02e10b16e5b43a232c3517f 0 received. +[stage-24] FULLRESYNC d09c7f261015fb222924baa530f73db6b41484af 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-master-psync-rdb/pass b/internal/test_helpers/fixtures/repl-master-psync-rdb/pass index 2bb42f6c..28d86284 100644 --- a/internal/test_helpers/fixtures/repl-master-psync-rdb/pass +++ b/internal/test_helpers/fixtures/repl-master-psync-rdb/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:29:13.060) -[stage-7] $ redis-cli get grapes (sent at 16:29:13.060, key should not be expired) +[stage-7] Received OK (at 17:48:27.995) +[stage-7] $ redis-cli get grapes (sent at 17:48:27.995, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:29:13.161, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:48:28.096, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1760842190 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2370512747 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1444017535 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles883898223 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2212413569 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles642550356 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3644388544 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2762451277 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles575487084 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1262765697 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles764469797 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles42228813 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC ee09abebf1e9a71949ffdc7d7a68e62e63c28ce2 0 received. +[stage-22] FULLRESYNC 8a1d3c6dd8918a0dd95e669cbedcedf50bc9907a 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC fb9fa8f2e5ee99345b1bd746ff07404f6c2ea370 0 received. +[stage-23] FULLRESYNC af522057e743a2c3a08b57d290359eeb5619c0a9 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program diff --git a/internal/test_helpers/fixtures/repl-master-psync/pass b/internal/test_helpers/fixtures/repl-master-psync/pass index b1b63807..a6060dee 100644 --- a/internal/test_helpers/fixtures/repl-master-psync/pass +++ b/internal/test_helpers/fixtures/repl-master-psync/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:31:24.801) -[stage-7] $ redis-cli get grapes (sent at 16:31:24.801, key should not be expired) +[stage-7] Received OK (at 17:48:10.307) +[stage-7] $ redis-cli get grapes (sent at 17:48:10.307, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:31:24.902, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:48:10.408, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles235310941 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles676365985 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1404183815 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3300687855 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2786869738 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4293840167 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2697767959 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles982005965 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3590816161 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1115022476 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4237431452 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1018452318 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 084a9dc81102921b23cf5cbfc37ba1e5e54bdb46 0 received. +[stage-22] FULLRESYNC 64cc3ebd8df9499404e9f72d55f4b9f0cd7c54eb 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-master-replconf/pass b/internal/test_helpers/fixtures/repl-master-replconf/pass index 9e64f395..0927b778 100644 --- a/internal/test_helpers/fixtures/repl-master-replconf/pass +++ b/internal/test_helpers/fixtures/repl-master-replconf/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:31:07.227) -[stage-7] $ redis-cli get grapes (sent at 16:31:07.227, key should not be expired) +[stage-7] Received OK (at 17:47:52.758) +[stage-7] $ redis-cli get grapes (sent at 17:47:52.758, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:31:07.328, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:47:52.860, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3556820796 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles393387283 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2876082002 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2049344211 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3471627663 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles374287596 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2526723552 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3559833868 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles284446884 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3043249676 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles501559455 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2172489667 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-multiple-replicas/pass b/internal/test_helpers/fixtures/repl-multiple-replicas/pass index cd245dd7..44a6a14a 100644 --- a/internal/test_helpers/fixtures/repl-multiple-replicas/pass +++ b/internal/test_helpers/fixtures/repl-multiple-replicas/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:29:31.083) -[stage-7] $ redis-cli get grapes (sent at 16:29:31.083, key should not be expired) +[stage-7] Received OK (at 17:50:32.617) +[stage-7] $ redis-cli get grapes (sent at 17:50:32.617, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:29:31.184, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:50:32.719, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles695361141 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2857783601 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2680232014 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles668796496 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles877152066 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3709185890 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1369157898 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1964480549 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles403947166 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4159485576 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles669823371 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2874466054 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 7599f887dd7945accf992314b05cf17750696e7f 0 received. +[stage-22] FULLRESYNC cffdb109dd4f9d4397827d123d6bea9705cdca89 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 42810049abdbe43c4b049b6b2f9e8e148e53d98a 0 received. +[stage-23] FULLRESYNC e8e6c1afc68c448f7a2d376a4a5fe59bec6081c0 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC c7cc861f4236cf41a193518b69cd1f5292b184fd 0 received. +[stage-24] FULLRESYNC a4364b27b78947e14ef67c58d8e983d9b7579a14 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 0 received. +[stage-25] [replica-1] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 0 received. +[stage-25] [replica-2] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 0 received. +[stage-25] [replica-3] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass b/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass index a7cfc269..054b99d6 100644 --- a/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass +++ b/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:29:50.003) -[stage-7] $ redis-cli get grapes (sent at 16:29:50.003, key should not be expired) +[stage-7] Received OK (at 17:48:46.018) +[stage-7] $ redis-cli get grapes (sent at 17:48:46.018, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:29:50.104, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:48:46.119, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles496028966 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles711424128 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles242027416 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4082499695 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles518465251 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1488057880 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles580073728 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3963398658 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1915911637 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2782254509 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3255760112 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3249849934 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC ac29f0e05ba22a77e18645b02cdea35c2f0ce931 0 received. +[stage-22] FULLRESYNC d575ab65228c72fff6b4c32ad9cf5b4bc894c641 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 7d172465450bb2fe1ef3eb0cbcc44f0c560e9f79 0 received. +[stage-23] FULLRESYNC 33786e60fd327963f821a65b1904f1677eae34ff 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC b264c3dfd907869fdcf06936cc8ca32a64205d10 0 received. +[stage-24] FULLRESYNC 38bbea0b59731852bf09719f66fcd70d27c5a173 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 0 received. +[stage-25] [replica-1] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 0 received. +[stage-25] [replica-2] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 0 received. +[stage-25] [replica-3] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-getack/pass b/internal/test_helpers/fixtures/repl-replica-getack/pass index 2ae766ec..8485081d 100644 --- a/internal/test_helpers/fixtures/repl-replica-getack/pass +++ b/internal/test_helpers/fixtures/repl-replica-getack/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:28:07.162) -[stage-7] $ redis-cli get grapes (sent at 16:28:07.162, key should not be expired) +[stage-7] Received OK (at 17:49:56.816) +[stage-7] $ redis-cli get grapes (sent at 17:49:56.816, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:28:07.263, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:49:56.917, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles817367463 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2390771917 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1981694510 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1177460568 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2270058779 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3411440560 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3318145405 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles646487729 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3725340140 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1823888993 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1001712302 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles878041147 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 01a51ef2717e1a94b5a1003f9b0c8c6c702bdcc9 0 received. +[stage-22] FULLRESYNC afaaa51887500ec0363252a392a93ff4ecb192b8 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC b652946d5e3edc80cb25ca5c30740cd2d16c51ab 0 received. +[stage-23] FULLRESYNC 487486056d58294cde2e4b4c866d587022548b3c 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 3e7f5ef294763fa3ac4de87a4aeb82692fbef354 0 received. +[stage-24] FULLRESYNC 3f7c9ccaf02e82c9e8102ed4115c17a1e06fbfad 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 0 received. +[stage-25] [replica-1] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 0 received. +[stage-25] [replica-2] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 0 received. +[stage-25] [replica-3] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-ping/pass b/internal/test_helpers/fixtures/repl-replica-ping/pass index a91c723e..779878dc 100644 --- a/internal/test_helpers/fixtures/repl-replica-ping/pass +++ b/internal/test_helpers/fixtures/repl-replica-ping/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:30:50.063) -[stage-7] $ redis-cli get grapes (sent at 16:30:50.063, key should not be expired) +[stage-7] Received OK (at 17:47:35.613) +[stage-7] $ redis-cli get grapes (sent at 17:47:35.613, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:30:50.164, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:47:35.714, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3444256582 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2387208259 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles227187650 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1377203543 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2377482709 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2442391875 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2202004223 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4135789448 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles839046873 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2407838768 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3769068849 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles312488130 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-replica-psync/pass b/internal/test_helpers/fixtures/repl-replica-psync/pass index 2f7e9539..9e5b1702 100644 --- a/internal/test_helpers/fixtures/repl-replica-psync/pass +++ b/internal/test_helpers/fixtures/repl-replica-psync/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:30:11.445) -[stage-7] $ redis-cli get grapes (sent at 16:30:11.445, key should not be expired) +[stage-7] Received OK (at 17:44:41.575) +[stage-7] $ redis-cli get grapes (sent at 17:44:41.575, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:30:11.546, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:44:41.676, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles350213682 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1021280272 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2668448713 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2883856298 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2379083229 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1057215009 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2410802832 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3195046909 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1230512208 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1762229260 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2038647893 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles406868853 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-replica-replconf/pass b/internal/test_helpers/fixtures/repl-replica-replconf/pass index 2fc6a61c..755e96cc 100644 --- a/internal/test_helpers/fixtures/repl-replica-replconf/pass +++ b/internal/test_helpers/fixtures/repl-replica-replconf/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:26:57.518) -[stage-7] $ redis-cli get grapes (sent at 16:26:57.518, key should not be expired) +[stage-7] Received OK (at 17:47:01.200) +[stage-7] $ redis-cli get grapes (sent at 17:47:01.200, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:26:57.619, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:47:01.301, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1333443561 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1498057317 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3823059875 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1359639338 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3861126753 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4247940688 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2086923055 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1017781578 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1811636817 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3000824852 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles7135806 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1814848759 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-wait-zero-offset/pass b/internal/test_helpers/fixtures/repl-wait-zero-offset/pass index 4604b0c6..1d2676ac 100644 --- a/internal/test_helpers/fixtures/repl-wait-zero-offset/pass +++ b/internal/test_helpers/fixtures/repl-wait-zero-offset/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:30:28.861) -[stage-7] $ redis-cli get grapes (sent at 16:30:28.861, key should not be expired) +[stage-7] Received OK (at 17:45:17.342) +[stage-7] $ redis-cli get grapes (sent at 17:45:17.342, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:30:28.962, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:45:17.443, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3634131871 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles214301294 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3317428780 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2237918703 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles138355963 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1628197888 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1275818168 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4031459991 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles878420060 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2635391458 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1774391523 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3907128123 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 89689b309cdea8ec0028f0f20063ab9a996d63e7 0 received. +[stage-22] FULLRESYNC cb95c0a973b3e859d8f83cddc938a4f8d9215e32 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 758a594d20ff2e25bb321189291dae8319f61ce3 0 received. +[stage-23] FULLRESYNC 5e7739e6fa23a00943c9dbc03960ca8734e8a10e 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 9e02d0f657ac4cfe3c11c19791140b867618ca20 0 received. +[stage-24] FULLRESYNC c37f84696ca6345b9f4ac417c68e14a6df10e253 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 0 received. +[stage-25] [replica-1] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 0 received. +[stage-25] [replica-2] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 0 received. +[stage-25] [replica-3] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 @@ -391,7 +391,7 @@ Debug = true [stage-30] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-1] OK received. [stage-30] [replica-1] $ redis-cli PSYNC ? -1 -[stage-30] [replica-1] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. +[stage-30] [replica-1] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. [stage-30] [replica-1] Successfully received RDB file from master. [stage-30] Creating replica : 1. [stage-30] [replica-2] $ redis-cli PING @@ -399,7 +399,7 @@ Debug = true [stage-30] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-2] OK received. [stage-30] [replica-2] $ redis-cli PSYNC ? -1 -[stage-30] [replica-2] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. +[stage-30] [replica-2] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. [stage-30] [replica-2] Successfully received RDB file from master. [stage-30] Creating replica : 2. [stage-30] [replica-3] $ redis-cli PING @@ -407,7 +407,7 @@ Debug = true [stage-30] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-3] OK received. [stage-30] [replica-3] $ redis-cli PSYNC ? -1 -[stage-30] [replica-3] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. +[stage-30] [replica-3] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. [stage-30] [replica-3] Successfully received RDB file from master. [stage-30] Creating replica : 3. [stage-30] [replica-4] $ redis-cli PING @@ -415,7 +415,7 @@ Debug = true [stage-30] [replica-4] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-4] OK received. [stage-30] [replica-4] $ redis-cli PSYNC ? -1 -[stage-30] [replica-4] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. +[stage-30] [replica-4] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. [stage-30] [replica-4] Successfully received RDB file from master. [stage-30] Creating replica : 4. [stage-30] [replica-5] $ redis-cli PING @@ -423,7 +423,7 @@ Debug = true [stage-30] [replica-5] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-5] OK received. [stage-30] [replica-5] $ redis-cli PSYNC ? -1 -[stage-30] [replica-5] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. +[stage-30] [replica-5] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. [stage-30] [replica-5] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 [stage-30] [client] 5 received. diff --git a/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass b/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass index c439615c..c69bbbe3 100644 --- a/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass +++ b/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:28:26.341) -[stage-7] $ redis-cli get grapes (sent at 16:28:26.341, key should not be expired) +[stage-7] Received OK (at 17:46:12.962) +[stage-7] $ redis-cli get grapes (sent at 17:46:12.962, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:28:26.442, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:46:13.064, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3365965963 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles546426643 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1387457436 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3006361094 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles597377667 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4071477655 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1515643356 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2015185639 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2101884143 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2657903288 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles340016108 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3676437565 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC f4b662d6c3e6de0cb07c2eb10b843d36f4b2bdf3 0 received. +[stage-22] FULLRESYNC 6512050bdddbd5bfec09bb60cebe296218603497 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC a3a7c373af5ad395851b40a29bb3e33d8668ec33 0 received. +[stage-23] FULLRESYNC 295f04587c25c328fa3fe847d46dbbf807d01dd0 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC f3e81a337eead09be97e174328c548d0a7b350d6 0 received. +[stage-24] FULLRESYNC 05106ed850ff3082b97a53bbc1c25df4088bd01d 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 0 received. +[stage-25] [replica-1] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 0 received. +[stage-25] [replica-2] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 0 received. +[stage-25] [replica-3] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-wait/pass b/internal/test_helpers/fixtures/repl-wait/pass index 7188a69a..0c98e0dc 100644 --- a/internal/test_helpers/fixtures/repl-wait/pass +++ b/internal/test_helpers/fixtures/repl-wait/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 16:28:45.797) -[stage-7] $ redis-cli get grapes (sent at 16:28:45.797, key should not be expired) +[stage-7] Received OK (at 17:45:38.531) +[stage-7] $ redis-cli get grapes (sent at 17:45:38.531, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 16:28:45.898, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:45:38.633, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2540450272 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2255389461 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1976654656 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1772531090 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1393016850 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1073171776 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1402371246 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3082845662 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785220533 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles421922709 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4227093237 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1118073483 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 50edd65cbe5709dfc21b36f951a8be85350649f7 0 received. +[stage-22] FULLRESYNC a69a6e3bf38afe7ff50bac22eea0d16f08eab5fa 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 270e6853ac0dd0f6fe0e1ac65b27c5ff8244dcd8 0 received. +[stage-23] FULLRESYNC c2df559ffac98f5b63a5c62aa23d8613f7ddd4d6 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 38bd36e5f0f6827774d17ac1dc55c7407002355b 0 received. +[stage-24] FULLRESYNC b5bc3a8f3b5fa1ec73f6ce6c8bd054f952b75f55 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 0 received. +[stage-25] [replica-1] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 0 received. +[stage-25] [replica-2] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 0 received. +[stage-25] [replica-3] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 @@ -391,7 +391,7 @@ Debug = true [stage-30] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-1] OK received. [stage-30] [replica-1] $ redis-cli PSYNC ? -1 -[stage-30] [replica-1] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. +[stage-30] [replica-1] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. [stage-30] [replica-1] Successfully received RDB file from master. [stage-30] Creating replica : 1. [stage-30] [replica-2] $ redis-cli PING @@ -399,7 +399,7 @@ Debug = true [stage-30] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-2] OK received. [stage-30] [replica-2] $ redis-cli PSYNC ? -1 -[stage-30] [replica-2] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. +[stage-30] [replica-2] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. [stage-30] [replica-2] Successfully received RDB file from master. [stage-30] Creating replica : 2. [stage-30] [replica-3] $ redis-cli PING @@ -407,7 +407,7 @@ Debug = true [stage-30] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-3] OK received. [stage-30] [replica-3] $ redis-cli PSYNC ? -1 -[stage-30] [replica-3] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. +[stage-30] [replica-3] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. [stage-30] [replica-3] Successfully received RDB file from master. [stage-30] Creating replica : 3. [stage-30] [replica-4] $ redis-cli PING @@ -415,7 +415,7 @@ Debug = true [stage-30] [replica-4] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-4] OK received. [stage-30] [replica-4] $ redis-cli PSYNC ? -1 -[stage-30] [replica-4] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. +[stage-30] [replica-4] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. [stage-30] [replica-4] Successfully received RDB file from master. [stage-30] Creating replica : 4. [stage-30] [replica-5] $ redis-cli PING @@ -423,7 +423,7 @@ Debug = true [stage-30] [replica-5] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-5] OK received. [stage-30] [replica-5] $ redis-cli PSYNC ? -1 -[stage-30] [replica-5] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. +[stage-30] [replica-5] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. [stage-30] [replica-5] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 [stage-30] [client] 5 received. @@ -448,7 +448,7 @@ Debug = true [stage-31] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-1] OK received. [stage-31] [replica-1] $ redis-cli PSYNC ? -1 -[stage-31] [replica-1] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 0 received. +[stage-31] [replica-1] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. [stage-31] [replica-1] Successfully received RDB file from master. [stage-31] Creating replica : 2. [stage-31] [replica-2] $ redis-cli PING @@ -456,7 +456,7 @@ Debug = true [stage-31] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-2] OK received. [stage-31] [replica-2] $ redis-cli PSYNC ? -1 -[stage-31] [replica-2] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 0 received. +[stage-31] [replica-2] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. [stage-31] [replica-2] Successfully received RDB file from master. [stage-31] Creating replica : 3. [stage-31] [replica-3] $ redis-cli PING @@ -464,7 +464,7 @@ Debug = true [stage-31] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-3] OK received. [stage-31] [replica-3] $ redis-cli PSYNC ? -1 -[stage-31] [replica-3] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 0 received. +[stage-31] [replica-3] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. [stage-31] [replica-3] Successfully received RDB file from master. [stage-31] [client] $ redis-cli SET foo 123 [stage-31] [client] $ redis-cli WAIT 1 500 From 18aeb5d67196b32ca67e0114ad5f91080a1e4497 Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Mon, 12 Feb 2024 09:38:39 +0000 Subject: [PATCH 2/5] Implement capability to compare user messages with multiple possible options. --- internal/util.go | 58 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/internal/util.go b/internal/util.go index 68ded46d..63125960 100644 --- a/internal/util.go +++ b/internal/util.go @@ -51,6 +51,23 @@ func NewFakeRedisReplica(conn net.Conn, logger *logger.Logger) *FakeRedisReplica func (master FakeRedisMaster) Assert(receiveMessages []string, sendMessage string, caseSensitiveMatch bool) error { err, _ := master.readAndAssertMessages(receiveMessages, caseSensitiveMatch) + if err != nil { + return err + } + _, err = master.Writer.WriteString(sendMessage) + if err != nil { + return err + } + master.Writer.Flush() + master.Logger.Infof("%s sent.", strings.ReplaceAll(sendMessage, "\r\n", "")) + return nil +} + +func (master FakeRedisMaster) AssertWithOr(receiveMessages [][]string, sendMessage string, caseSensitiveMatch bool) error { + err, _ := master.readAndAssertMessagesWithOr(receiveMessages, caseSensitiveMatch) + if err != nil { + return err + } _, err = master.Writer.WriteString(sendMessage) if err != nil { return err @@ -69,7 +86,7 @@ func (master FakeRedisMaster) AssertReplConfPort() error { } func (master FakeRedisMaster) AssertReplConfCapa() error { - return master.Assert([]string{"REPLCONF", "*", "*", "*", "*"}, "+OK\r\n", false) + return master.AssertWithOr([][]string{{"REPLCONF", "capa", "*"}, {"REPLCONF", "capa", "*", "capa", "*"}}, "+OK\r\n", false) } func (master FakeRedisMaster) AssertPsync() error { id := RandomAlphanumericString(40) @@ -261,6 +278,23 @@ func compareStringSlices(actual, expected []string, caseSensitiveMatch bool) err return nil } +func compareStringSlicesWithOr(actual []string, expected [][]string, caseSensitiveMatch bool) error { + var foundMatch bool + var e error + + for _, exp := range expected { + e := compareStringSlices(actual, exp, caseSensitiveMatch) + if e == nil { + foundMatch = true + } + } + + if foundMatch == true { + return nil + } + return e // Will return last error. Will accordingly call assert. +} + func parseInfoOutput(lines []string, seperator string) map[string]string { infoMap := make(map[string]string) for _, line := range lines { @@ -393,6 +427,20 @@ func (node FakeRedisNode) readAndAssertMessages(messages []string, caseSensitive return nil, offset } +func (node FakeRedisNode) readAndAssertMessagesWithOr(messages [][]string, caseSensitiveMatch bool) (error, int) { + actualMessages, err := node.readRespMessages() + offset := GetByteOffset(actualMessages) + if err != nil { + return err, 0 + } + + err = node.assertMessagesWithOr(actualMessages, messages, caseSensitiveMatch) + if err != nil { + return err, 0 + } + return nil, offset +} + func (node FakeRedisNode) assertMessages(actualMessages []string, expectedMessages []string, caseSensitiveMatch bool) error { err := compareStringSlices(actualMessages, expectedMessages, caseSensitiveMatch) if err != nil { @@ -402,6 +450,14 @@ func (node FakeRedisNode) assertMessages(actualMessages []string, expectedMessag return nil } +func (node FakeRedisNode) assertMessagesWithOr(actualMessages []string, expectedMessages [][]string, caseSensitiveMatch bool) error { + err := compareStringSlicesWithOr(actualMessages, expectedMessages, caseSensitiveMatch) + if err != nil { + return err + } + node.Logger.Successf(node.LogPrefix + strings.Join(actualMessages, " ") + " received.") + return nil +} func (node FakeRedisNode) readAndAssertMessage(expectedMessage string, caseSensitiveMatch bool) error { actualMessage, err := node.readRespString() if err != nil { From 319ad5795b4ed2aaf8202cf67a1f57cb039f5a0c Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Mon, 12 Feb 2024 16:51:16 +0000 Subject: [PATCH 3/5] Return if connection couldn't be established. --- internal/test_repl_master_cmd_prop.go | 2 ++ internal/test_repl_master_psync.go | 1 + internal/test_repl_master_psync_rdb.go | 1 + internal/test_repl_master_replconf.go | 1 + internal/test_repl_multiple_replicas.go | 2 ++ internal/test_repl_wait_zero_offset.go | 5 +++-- internal/test_repl_wait_zero_replicas.go | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/internal/test_repl_master_cmd_prop.go b/internal/test_repl_master_cmd_prop.go index c17ec44b..eec27fc2 100644 --- a/internal/test_repl_master_cmd_prop.go +++ b/internal/test_repl_master_cmd_prop.go @@ -22,11 +22,13 @@ func testReplMasterCmdProp(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } conn1, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } client := NewFakeRedisMaster(conn1, logger) diff --git a/internal/test_repl_master_psync.go b/internal/test_repl_master_psync.go index 5d5c9d1a..5ee838a6 100644 --- a/internal/test_repl_master_psync.go +++ b/internal/test_repl_master_psync.go @@ -21,6 +21,7 @@ func testReplMasterPsync(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } replica := NewFakeRedisReplica(conn, logger) diff --git a/internal/test_repl_master_psync_rdb.go b/internal/test_repl_master_psync_rdb.go index 71776432..39529b3f 100644 --- a/internal/test_repl_master_psync_rdb.go +++ b/internal/test_repl_master_psync_rdb.go @@ -22,6 +22,7 @@ func testReplMasterPsyncRdb(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } replica := NewFakeRedisReplica(conn, logger) diff --git a/internal/test_repl_master_replconf.go b/internal/test_repl_master_replconf.go index 8b1b8640..60b8fbb1 100644 --- a/internal/test_repl_master_replconf.go +++ b/internal/test_repl_master_replconf.go @@ -21,6 +21,7 @@ func testReplMasterReplconf(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } replica := NewFakeRedisReplica(conn, logger) diff --git a/internal/test_repl_multiple_replicas.go b/internal/test_repl_multiple_replicas.go index 292802f7..f86b64bf 100644 --- a/internal/test_repl_multiple_replicas.go +++ b/internal/test_repl_multiple_replicas.go @@ -25,6 +25,7 @@ func testReplMultipleReplicas(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } defer conn.Close() replica := NewFakeRedisReplica(conn, logger) @@ -35,6 +36,7 @@ func testReplMultipleReplicas(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } defer conn.Close() client := NewFakeRedisMaster(conn, logger) diff --git a/internal/test_repl_wait_zero_offset.go b/internal/test_repl_wait_zero_offset.go index da520bf1..9cfe28d1 100644 --- a/internal/test_repl_wait_zero_offset.go +++ b/internal/test_repl_wait_zero_offset.go @@ -28,11 +28,11 @@ func testWaitZeroOffset(stageHarness *testerutils.StageHarness) error { for i := 0; i < replicaCount; i++ { logger.Debugf("Creating replica : %v.", i) conn, err := NewRedisConn("", "localhost:6379") - defer conn.Close() - if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } + defer conn.Close() replica := NewFakeRedisReplica(conn, logger) replica.LogPrefix = fmt.Sprintf("[replica-%v] ", i+1) @@ -45,6 +45,7 @@ func testWaitZeroOffset(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } client := NewFakeRedisMaster(conn, logger) diff --git a/internal/test_repl_wait_zero_replicas.go b/internal/test_repl_wait_zero_replicas.go index 030c71d9..2a5ec41f 100644 --- a/internal/test_repl_wait_zero_replicas.go +++ b/internal/test_repl_wait_zero_replicas.go @@ -22,6 +22,7 @@ func testWaitZeroReplicas(stageHarness *testerutils.StageHarness) error { conn, err := NewRedisConn("", "localhost:6379") if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } client := NewFakeRedisMaster(conn, logger) From b8809112d568d5d8f7a1df29678477296dd0fd45 Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Mon, 12 Feb 2024 16:52:43 +0000 Subject: [PATCH 4/5] Minor fixes to WAIT test. 1. Return if connection failed. 2. Return if WAIT reply mismatch. 3. Random numbers shouldn't be 0. --- internal/test_repl_wait.go | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/test_repl_wait.go b/internal/test_repl_wait.go index ca231e80..bedcc653 100644 --- a/internal/test_repl_wait.go +++ b/internal/test_repl_wait.go @@ -32,10 +32,11 @@ func testWait(stageHarness *testerutils.StageHarness) error { for i := 0; i < replicaCount; i++ { logger.Debugf("Creating replica : %v.", i+1) conn, err := NewRedisConn("", "localhost:6379") - defer conn.Close() if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } + defer conn.Close() replica := NewFakeRedisReplica(conn, logger) replicas = append(replicas, replica) @@ -48,10 +49,11 @@ func testWait(stageHarness *testerutils.StageHarness) error { } conn, err := NewRedisConn("", "localhost:6379") - defer conn.Close() if err != nil { fmt.Println("Error connecting to TCP server:", err) + return err } + defer conn.Close() client := NewFakeRedisMaster(conn, logger) client.LogPrefix = "[client] " @@ -63,8 +65,6 @@ func testWait(stageHarness *testerutils.StageHarness) error { return err } - ////////////////////////////////////////////////////// - ANSWER := 1 // READ STREAM ON ALL REPLICAS for i := 0; i < replicaCount; i++ { @@ -88,13 +88,14 @@ func testWait(stageHarness *testerutils.StageHarness) error { replica.Send([]string{"REPLCONF", "ACK", strconv.Itoa(offset)}) } - client.readAndAssertIntMessage(ANSWER) - - ////////////////////////////////////////////////////// + err = client.readAndAssertIntMessage(ANSWER) + if err != nil { + return err + } client.SendAndAssert([]string{"SET", "baz", "789"}, []string{"OK"}) - ANSWER = min(replicaCount, testerutils_random.RandomInt(0, 6)) + ANSWER = min(replicaCount, testerutils_random.RandomInt(2, 6)) TIMEOUT := 2000 sendCount := strconv.Itoa(ANSWER + 1) startTimeMilli := time.Now().UnixMilli() @@ -117,16 +118,16 @@ func testWait(stageHarness *testerutils.StageHarness) error { if err != nil { return err } - } - for i := 0; i < ANSWER; i++ { - replica := replicas[i] - replica.Send([]string{"REPLCONF", "ACK", strconv.Itoa(offset)}) + if i < ANSWER { + replica.Send([]string{"REPLCONF", "ACK", strconv.Itoa(offset)}) + } } - client.readAndAssertIntMessage(ANSWER) - - ////////////////////////////////////////////////////// + err = client.readAndAssertIntMessage(ANSWER) + if err != nil { + return err + } endTimeMilli := time.Now().UnixMilli() From 4f485b37606e7a22ceb0dfc6dc452b0a51388bad Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Mon, 12 Feb 2024 17:27:14 +0000 Subject: [PATCH 5/5] Update fixtures. --- internal/test_helpers/fixtures/expiry/pass | 6 +- internal/test_helpers/fixtures/ping-pong/eof | 2 +- .../test_helpers/fixtures/rdb-config/pass | 8 +-- .../test_helpers/fixtures/rdb-read-key/pass | 10 ++-- .../fixtures/rdb-read-multiple-keys/pass | 14 ++--- .../rdb-read-multiple-string-values/pass | 16 +++--- .../fixtures/rdb-read-value-with-expiry/pass | 18 +++--- .../fixtures/rdb-string-value/pass | 12 ++-- .../fixtures/repl-cmd-processing/pass | 30 +++++----- .../fixtures/repl-custom-port/pass | 18 +++--- internal/test_helpers/fixtures/repl-id/pass | 18 +++--- .../fixtures/repl-info-replica/pass | 18 +++--- internal/test_helpers/fixtures/repl-info/pass | 18 +++--- .../fixtures/repl-master-cmd-prop/pass | 24 ++++---- .../fixtures/repl-master-psync-rdb/pass | 22 ++++---- .../fixtures/repl-master-psync/pass | 20 +++---- .../fixtures/repl-master-replconf/pass | 18 +++--- .../fixtures/repl-multiple-replicas/pass | 30 +++++----- .../fixtures/repl-replica-getack-nonzero/pass | 30 +++++----- .../fixtures/repl-replica-getack/pass | 30 +++++----- .../fixtures/repl-replica-ping/pass | 18 +++--- .../fixtures/repl-replica-psync/pass | 18 +++--- .../fixtures/repl-replica-replconf/pass | 18 +++--- .../fixtures/repl-wait-zero-offset/pass | 40 ++++++------- .../fixtures/repl-wait-zero-replicas/pass | 30 +++++----- internal/test_helpers/fixtures/repl-wait/pass | 56 ++++++++++--------- 26 files changed, 272 insertions(+), 270 deletions(-) diff --git a/internal/test_helpers/fixtures/expiry/pass b/internal/test_helpers/fixtures/expiry/pass index e3e0cb19..66d078ab 100644 --- a/internal/test_helpers/fixtures/expiry/pass +++ b/internal/test_helpers/fixtures/expiry/pass @@ -69,11 +69,11 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:50:51.530) -[stage-7] $ redis-cli get grapes (sent at 17:50:51.530, key should not be expired) +[stage-7] Received OK (at 17:06:05.841) +[stage-7] $ redis-cli get grapes (sent at 17:06:05.841, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:50:51.632, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:06:05.942, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully diff --git a/internal/test_helpers/fixtures/ping-pong/eof b/internal/test_helpers/fixtures/ping-pong/eof index b944c187..1d20ad49 100644 --- a/internal/test_helpers/fixtures/ping-pong/eof +++ b/internal/test_helpers/fixtures/ping-pong/eof @@ -16,7 +16,7 @@ Debug = true [stage-2] $ redis-cli ping [stage-2] Reading response... [stage-2] Hint: 'connection reset by peer' usually means that your program closed the connection before sending a complete response. -[stage-2] read tcp 127.0.0.1:59976->127.0.0.1:6379: read: connection reset by peer +[stage-2] read tcp 127.0.0.1:40934->127.0.0.1:6379: read: connection reset by peer [stage-2] Test failed [stage-2] Terminating program [stage-2] Program terminated successfully diff --git a/internal/test_helpers/fixtures/rdb-config/pass b/internal/test_helpers/fixtures/rdb-config/pass index 66452914..78d205fe 100644 --- a/internal/test_helpers/fixtures/rdb-config/pass +++ b/internal/test_helpers/fixtures/rdb-config/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:46:35.525) -[stage-7] $ redis-cli get grapes (sent at 17:46:35.525, key should not be expired) +[stage-7] Received OK (at 17:05:04.110) +[stage-7] $ redis-cli get grapes (sent at 17:05:04.110, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:46:35.627, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:05:04.211, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3182181644 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3427354740 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-key/pass b/internal/test_helpers/fixtures/rdb-read-key/pass index 18ca3a49..19e00b4f 100644 --- a/internal/test_helpers/fixtures/rdb-read-key/pass +++ b/internal/test_helpers/fixtures/rdb-read-key/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:46:04.792) -[stage-7] $ redis-cli get grapes (sent at 17:46:04.792, key should not be expired) +[stage-7] Received OK (at 17:08:26.941) +[stage-7] $ redis-cli get grapes (sent at 17:08:26.941, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:46:04.893, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:08:27.042, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2243917711 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2544575897 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3306017459 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2889088137 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass b/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass index c8b07d3b..f79963a8 100644 --- a/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass +++ b/internal/test_helpers/fixtures/rdb-read-multiple-keys/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:46:49.838) -[stage-7] $ redis-cli get grapes (sent at 17:46:49.838, key should not be expired) +[stage-7] Received OK (at 17:06:37.814) +[stage-7] $ redis-cli get grapes (sent at 17:06:37.814, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:46:49.939, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:06:37.915, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1267355796 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3228425667 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles541287302 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1346244657 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3173847821 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1308470631 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4046061762 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1518517472 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program diff --git a/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass b/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass index d4939ccd..9db13263 100644 --- a/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass +++ b/internal/test_helpers/fixtures/rdb-read-multiple-string-values/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:50:54.484) -[stage-7] $ redis-cli get grapes (sent at 17:50:54.484, key should not be expired) +[stage-7] Received OK (at 17:06:08.785) +[stage-7] $ redis-cli get grapes (sent at 17:06:08.785, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:50:54.585, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:06:08.886, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2711934345 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles360452185 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3034196230 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles973568596 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1569058598 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles997733393 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles897471162 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles369671918 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles7429286 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4056080642 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape diff --git a/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass b/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass index 2a48f683..44ae4cc9 100644 --- a/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass +++ b/internal/test_helpers/fixtures/rdb-read-value-with-expiry/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:49:05.328) -[stage-7] $ redis-cli get grapes (sent at 17:49:05.328, key should not be expired) +[stage-7] Received OK (at 17:06:22.245) +[stage-7] $ redis-cli get grapes (sent at 17:06:22.245, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:49:05.430, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:06:22.346, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1552243124 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3286858633 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1002264537 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3373171157 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles896246511 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles235023805 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3832849681 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3548981705 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4246796746 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles510463612 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3430211170 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2932128110 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/rdb-string-value/pass b/internal/test_helpers/fixtures/rdb-string-value/pass index 4a096fc0..58fe2339 100644 --- a/internal/test_helpers/fixtures/rdb-string-value/pass +++ b/internal/test_helpers/fixtures/rdb-string-value/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:46:40.577) -[stage-7] $ redis-cli get grapes (sent at 17:46:40.577, key should not be expired) +[stage-7] Received OK (at 17:08:34.090) +[stage-7] $ redis-cli get grapes (sent at 17:08:34.090, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:46:40.678, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:08:34.191, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3946266756 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2545953674 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1496371479 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1431063544 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3554182541 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles112817032 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program diff --git a/internal/test_helpers/fixtures/repl-cmd-processing/pass b/internal/test_helpers/fixtures/repl-cmd-processing/pass index 69d74bf6..2c87e6ca 100644 --- a/internal/test_helpers/fixtures/repl-cmd-processing/pass +++ b/internal/test_helpers/fixtures/repl-cmd-processing/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:49:37.776) -[stage-7] $ redis-cli get grapes (sent at 17:49:37.776, key should not be expired) +[stage-7] Received OK (at 17:07:29.837) +[stage-7] $ redis-cli get grapes (sent at 17:07:29.837, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:49:37.877, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:07:29.938, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2506569173 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles144160577 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles236749854 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1916155 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2771015094 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles565113151 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3411227736 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles734331442 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles98052258 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles891832649 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1121234224 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles539472684 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC d467595f17fecd5a5c73a990022b93ae039d8e60 0 received. +[stage-22] FULLRESYNC 931dc6a3deec9745ca6e6cc0ec0fecef09e3c355 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 98f7c9d581f7f22040f681ffe8c2c47872972942 0 received. +[stage-23] FULLRESYNC 8465bcc5a5c4d72d0b691a0375e489e3e6c6aafa 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 784d03bf29fdf6ffa5d20d3349f9293343d797e3 0 received. +[stage-24] FULLRESYNC 3d043e0ef7273a415f332d11856cee48c50b5c18 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. +[stage-25] [replica-1] FULLRESYNC ab31048278cf93ad4c99a6fd82cdd651a772eec0 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. +[stage-25] [replica-2] FULLRESYNC ab31048278cf93ad4c99a6fd82cdd651a772eec0 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 4bb4de5e18bee7c2b0e726d4a1419842b287e3af 0 received. +[stage-25] [replica-3] FULLRESYNC ab31048278cf93ad4c99a6fd82cdd651a772eec0 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-custom-port/pass b/internal/test_helpers/fixtures/repl-custom-port/pass index 1057c1b0..bffa6f44 100644 --- a/internal/test_helpers/fixtures/repl-custom-port/pass +++ b/internal/test_helpers/fixtures/repl-custom-port/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:50:16.005) -[stage-7] $ redis-cli get grapes (sent at 17:50:16.005, key should not be expired) +[stage-7] Received OK (at 17:02:38.819) +[stage-7] $ redis-cli get grapes (sent at 17:02:38.819, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:50:16.106, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:02:38.921, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1350693201 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2527256141 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3095446568 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4135299087 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1072810271 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1820056169 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785573142 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles160146890 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2346882724 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles692959803 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1454348777 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1852825978 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-id/pass b/internal/test_helpers/fixtures/repl-id/pass index 93397ee1..1e3218c5 100644 --- a/internal/test_helpers/fixtures/repl-id/pass +++ b/internal/test_helpers/fixtures/repl-id/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:44:24.572) -[stage-7] $ redis-cli get grapes (sent at 17:44:24.572, key should not be expired) +[stage-7] Received OK (at 17:07:12.847) +[stage-7] $ redis-cli get grapes (sent at 17:07:12.847, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:44:24.673, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:07:12.949, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2026176341 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2768800645 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3209625356 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3585097475 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2339284321 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3322557658 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1498713790 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles722375048 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles533475082 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1472293148 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785418251 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles154852844 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-info-replica/pass b/internal/test_helpers/fixtures/repl-info-replica/pass index d2ffee54..4fad2f15 100644 --- a/internal/test_helpers/fixtures/repl-info-replica/pass +++ b/internal/test_helpers/fixtures/repl-info-replica/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:49:20.898) -[stage-7] $ redis-cli get grapes (sent at 17:49:20.898, key should not be expired) +[stage-7] Received OK (at 17:03:12.163) +[stage-7] $ redis-cli get grapes (sent at 17:03:12.163, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:49:21.000, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:03:12.265, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2311973092 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2372408450 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3897694714 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1814527230 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2204841688 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4138652048 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles744882673 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles558647144 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2409265119 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3842099866 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles532192595 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2601058172 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-info/pass b/internal/test_helpers/fixtures/repl-info/pass index 58d81b98..939b6cf3 100644 --- a/internal/test_helpers/fixtures/repl-info/pass +++ b/internal/test_helpers/fixtures/repl-info/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:44:07.824) -[stage-7] $ redis-cli get grapes (sent at 17:44:07.824, key should not be expired) +[stage-7] Received OK (at 17:02:55.426) +[stage-7] $ redis-cli get grapes (sent at 17:02:55.426, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:44:07.925, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:02:55.527, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2300305845 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2998504207 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3144401646 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1654539475 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1679942134 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4185419827 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1899737430 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3280573606 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3541167380 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2554617519 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2402082845 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1977166914 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-master-cmd-prop/pass b/internal/test_helpers/fixtures/repl-master-cmd-prop/pass index 86a07a86..96528514 100644 --- a/internal/test_helpers/fixtures/repl-master-cmd-prop/pass +++ b/internal/test_helpers/fixtures/repl-master-cmd-prop/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:44:58.986) -[stage-7] $ redis-cli get grapes (sent at 17:44:58.986, key should not be expired) +[stage-7] Received OK (at 17:04:04.598) +[stage-7] $ redis-cli get grapes (sent at 17:04:04.598, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:44:59.088, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:04:04.699, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3503127609 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2569460986 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles251196775 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles709680043 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1629576457 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2637432842 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3915321183 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1383953016 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2050038889 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles705609656 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3360379599 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1248522864 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC d09961bfa684b447d927a9a28b33c9c906ee642a 0 received. +[stage-22] FULLRESYNC 5a481a6936dddda51af89c75f3bb82c3dfaf2cd1 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 569cddc72d7395761f376d958dd97507639c2a44 0 received. +[stage-23] FULLRESYNC 685992dbbab895fdd38e6e15a5a403a7374cf3a3 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC d09c7f261015fb222924baa530f73db6b41484af 0 received. +[stage-24] FULLRESYNC cef9b36cf093c1a4eb3251fd371f8121760934b9 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-master-psync-rdb/pass b/internal/test_helpers/fixtures/repl-master-psync-rdb/pass index 28d86284..77b18174 100644 --- a/internal/test_helpers/fixtures/repl-master-psync-rdb/pass +++ b/internal/test_helpers/fixtures/repl-master-psync-rdb/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:48:27.995) -[stage-7] $ redis-cli get grapes (sent at 17:48:27.995, key should not be expired) +[stage-7] Received OK (at 17:03:46.595) +[stage-7] $ redis-cli get grapes (sent at 17:03:46.595, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:48:28.096, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:03:46.697, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2370512747 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles890235299 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles883898223 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1354674984 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles642550356 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2611267455 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2762451277 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1028561513 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1262765697 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2093736992 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles42228813 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3450581374 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 8a1d3c6dd8918a0dd95e669cbedcedf50bc9907a 0 received. +[stage-22] FULLRESYNC 9de38ec0ed46c1d380e0e8ff72ed0ca856a7b018 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC af522057e743a2c3a08b57d290359eeb5619c0a9 0 received. +[stage-23] FULLRESYNC 329949d9434172a3bd2b3a49aa88bc2b48150e6c 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program diff --git a/internal/test_helpers/fixtures/repl-master-psync/pass b/internal/test_helpers/fixtures/repl-master-psync/pass index a6060dee..00d67060 100644 --- a/internal/test_helpers/fixtures/repl-master-psync/pass +++ b/internal/test_helpers/fixtures/repl-master-psync/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:48:10.307) -[stage-7] $ redis-cli get grapes (sent at 17:48:10.307, key should not be expired) +[stage-7] Received OK (at 17:08:09.273) +[stage-7] $ redis-cli get grapes (sent at 17:08:09.273, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:48:10.408, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:08:09.374, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles676365985 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2718905884 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3300687855 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles839412351 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4293840167 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1414758397 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles982005965 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4088185225 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1115022476 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1528745136 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1018452318 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles446408618 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 64cc3ebd8df9499404e9f72d55f4b9f0cd7c54eb 0 received. +[stage-22] FULLRESYNC 2e8fd4a95589f0fe0b96680371033681fb3a1ccf 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-master-replconf/pass b/internal/test_helpers/fixtures/repl-master-replconf/pass index 0927b778..f06112f0 100644 --- a/internal/test_helpers/fixtures/repl-master-replconf/pass +++ b/internal/test_helpers/fixtures/repl-master-replconf/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:47:52.758) -[stage-7] $ redis-cli get grapes (sent at 17:47:52.758, key should not be expired) +[stage-7] Received OK (at 17:03:29.060) +[stage-7] $ redis-cli get grapes (sent at 17:03:29.060, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:47:52.860, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:03:29.161, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles393387283 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles715398329 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2049344211 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2160258359 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles374287596 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1462133926 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3559833868 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1609076918 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3043249676 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2933232982 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2172489667 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2267967988 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-multiple-replicas/pass b/internal/test_helpers/fixtures/repl-multiple-replicas/pass index 44a6a14a..0d4039b8 100644 --- a/internal/test_helpers/fixtures/repl-multiple-replicas/pass +++ b/internal/test_helpers/fixtures/repl-multiple-replicas/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:50:32.617) -[stage-7] $ redis-cli get grapes (sent at 17:50:32.617, key should not be expired) +[stage-7] Received OK (at 17:09:00.462) +[stage-7] $ redis-cli get grapes (sent at 17:09:00.462, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:50:32.719, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:09:00.564, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2857783601 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3447266821 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles668796496 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4144708693 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3709185890 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles141714341 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1964480549 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4133320546 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4159485576 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles836259142 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2874466054 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1372263156 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC cffdb109dd4f9d4397827d123d6bea9705cdca89 0 received. +[stage-22] FULLRESYNC a533fc9697cff3f95bbe358a3808d3c73d442599 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC e8e6c1afc68c448f7a2d376a4a5fe59bec6081c0 0 received. +[stage-23] FULLRESYNC 2dec146e1acb19a58eb62dc0f1deb5991042a7ea 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC a4364b27b78947e14ef67c58d8e983d9b7579a14 0 received. +[stage-24] FULLRESYNC e499e10e06acebffd9a7458e606f9fa97c54d05c 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. +[stage-25] [replica-1] FULLRESYNC b1c5aa36359496a6b562913a6bd29ed4fcfc6189 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. +[stage-25] [replica-2] FULLRESYNC b1c5aa36359496a6b562913a6bd29ed4fcfc6189 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 6e550fa379841104778c55de6e88af2e9ed261ce 0 received. +[stage-25] [replica-3] FULLRESYNC b1c5aa36359496a6b562913a6bd29ed4fcfc6189 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass b/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass index 054b99d6..b05d317a 100644 --- a/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass +++ b/internal/test_helpers/fixtures/repl-replica-getack-nonzero/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:48:46.018) -[stage-7] $ redis-cli get grapes (sent at 17:48:46.018, key should not be expired) +[stage-7] Received OK (at 17:04:44.817) +[stage-7] $ redis-cli get grapes (sent at 17:04:44.817, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:48:46.119, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:04:44.919, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles711424128 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1887091813 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4082499695 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2651749711 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1488057880 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4235327259 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3963398658 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2465607647 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2782254509 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles871172478 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3249849934 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3342451950 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC d575ab65228c72fff6b4c32ad9cf5b4bc894c641 0 received. +[stage-22] FULLRESYNC 0893f0aa9181685981753ffe8a1d7b57ac7acb4d 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 33786e60fd327963f821a65b1904f1677eae34ff 0 received. +[stage-23] FULLRESYNC e2571030fe9094262dc1647caeb6df68fee4eefb 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 38bbea0b59731852bf09719f66fcd70d27c5a173 0 received. +[stage-24] FULLRESYNC 38e4672a63c1581473ce7adc59af6f1fd415dada 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. +[stage-25] [replica-1] FULLRESYNC e34bbd03fdb19b0596951389e2ddf43a40ade0c4 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. +[stage-25] [replica-2] FULLRESYNC e34bbd03fdb19b0596951389e2ddf43a40ade0c4 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 2978cb16dd4ebed631170ea3b0c33aed09bdac11 0 received. +[stage-25] [replica-3] FULLRESYNC e34bbd03fdb19b0596951389e2ddf43a40ade0c4 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-getack/pass b/internal/test_helpers/fixtures/repl-replica-getack/pass index 8485081d..c70e0bf3 100644 --- a/internal/test_helpers/fixtures/repl-replica-getack/pass +++ b/internal/test_helpers/fixtures/repl-replica-getack/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:49:56.816) -[stage-7] $ redis-cli get grapes (sent at 17:49:56.816, key should not be expired) +[stage-7] Received OK (at 17:02:19.672) +[stage-7] $ redis-cli get grapes (sent at 17:02:19.672, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:49:56.917, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:02:19.773, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2390771917 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles569820633 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1177460568 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1508878023 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3411440560 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1885410214 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles646487729 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3041914869 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1823888993 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles616106525 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles878041147 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2687375247 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC afaaa51887500ec0363252a392a93ff4ecb192b8 0 received. +[stage-22] FULLRESYNC 6d918f3d88c90bef2c458b16cb9b39ccd40172bb 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 487486056d58294cde2e4b4c866d587022548b3c 0 received. +[stage-23] FULLRESYNC 2cc6f5cd898c314f58451f8b38aef2c2eb1bd25f 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 3f7c9ccaf02e82c9e8102ed4115c17a1e06fbfad 0 received. +[stage-24] FULLRESYNC dcef1cf8f3afc50390f1a202e80b79e3c58392f2 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. +[stage-25] [replica-1] FULLRESYNC 27bcda614e3f56391c7d9a306be7befc1fcf5f20 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. +[stage-25] [replica-2] FULLRESYNC 27bcda614e3f56391c7d9a306be7befc1fcf5f20 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 732f93d76ea73fa8bd1888114ec3c90f01cae605 0 received. +[stage-25] [replica-3] FULLRESYNC 27bcda614e3f56391c7d9a306be7befc1fcf5f20 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-replica-ping/pass b/internal/test_helpers/fixtures/repl-replica-ping/pass index 779878dc..c0ad4ce1 100644 --- a/internal/test_helpers/fixtures/repl-replica-ping/pass +++ b/internal/test_helpers/fixtures/repl-replica-ping/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:47:35.613) -[stage-7] $ redis-cli get grapes (sent at 17:47:35.613, key should not be expired) +[stage-7] Received OK (at 17:08:43.339) +[stage-7] $ redis-cli get grapes (sent at 17:08:43.339, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:47:35.714, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:08:43.440, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2387208259 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1983824194 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1377203543 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1611835003 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2442391875 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2860109547 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4135789448 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles69029399 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2407838768 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3651314897 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles312488130 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2142815721 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-replica-psync/pass b/internal/test_helpers/fixtures/repl-replica-psync/pass index 9e5b1702..16e0af8c 100644 --- a/internal/test_helpers/fixtures/repl-replica-psync/pass +++ b/internal/test_helpers/fixtures/repl-replica-psync/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:44:41.575) -[stage-7] $ redis-cli get grapes (sent at 17:44:41.575, key should not be expired) +[stage-7] Received OK (at 17:05:09.159) +[stage-7] $ redis-cli get grapes (sent at 17:05:09.159, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:44:41.676, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:05:09.261, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1021280272 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles418964771 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2883856298 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3465080506 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1057215009 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4042410974 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3195046909 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles155363168 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1762229260 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1954637538 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles406868853 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2302939397 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-replica-replconf/pass b/internal/test_helpers/fixtures/repl-replica-replconf/pass index 755e96cc..018ac32b 100644 --- a/internal/test_helpers/fixtures/repl-replica-replconf/pass +++ b/internal/test_helpers/fixtures/repl-replica-replconf/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:47:01.200) -[stage-7] $ redis-cli get grapes (sent at 17:47:01.200, key should not be expired) +[stage-7] Received OK (at 17:04:27.538) +[stage-7] $ redis-cli get grapes (sent at 17:04:27.538, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:47:01.301, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:04:27.640, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1498057317 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles232070228 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1359639338 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles238190012 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4247940688 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1903437343 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1017781578 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4131449540 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3000824852 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles844769872 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1814848759 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2305033444 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry diff --git a/internal/test_helpers/fixtures/repl-wait-zero-offset/pass b/internal/test_helpers/fixtures/repl-wait-zero-offset/pass index 1d2676ac..1f636ccc 100644 --- a/internal/test_helpers/fixtures/repl-wait-zero-offset/pass +++ b/internal/test_helpers/fixtures/repl-wait-zero-offset/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:45:17.342) -[stage-7] $ redis-cli get grapes (sent at 17:45:17.342, key should not be expired) +[stage-7] Received OK (at 17:05:26.556) +[stage-7] $ redis-cli get grapes (sent at 17:05:26.556, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:45:17.443, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:05:26.657, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles214301294 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles304418080 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2237918703 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1550200009 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1628197888 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1009308070 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4031459991 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2990826405 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2635391458 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2719772101 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3907128123 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2801663578 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC cb95c0a973b3e859d8f83cddc938a4f8d9215e32 0 received. +[stage-22] FULLRESYNC c8b81576ad85cb34763b1af59084432e4bd8b470 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 5e7739e6fa23a00943c9dbc03960ca8734e8a10e 0 received. +[stage-23] FULLRESYNC ad2bf57606238b900cca4adcad1faddb833c0306 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC c37f84696ca6345b9f4ac417c68e14a6df10e253 0 received. +[stage-24] FULLRESYNC 95532e9a1dd55e8a5784074a4f9631f37abe73f0 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. +[stage-25] [replica-1] FULLRESYNC b2b3de0f5fcf53338c8ddd6a4732a1b3ca609074 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. +[stage-25] [replica-2] FULLRESYNC b2b3de0f5fcf53338c8ddd6a4732a1b3ca609074 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 5ea359ae887a9af540cdfa6bf2145a0466643134 0 received. +[stage-25] [replica-3] FULLRESYNC b2b3de0f5fcf53338c8ddd6a4732a1b3ca609074 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 @@ -391,7 +391,7 @@ Debug = true [stage-30] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-1] OK received. [stage-30] [replica-1] $ redis-cli PSYNC ? -1 -[stage-30] [replica-1] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. +[stage-30] [replica-1] FULLRESYNC 3b9efc970d4fc292a031c15a048f3ee0af940922 0 received. [stage-30] [replica-1] Successfully received RDB file from master. [stage-30] Creating replica : 1. [stage-30] [replica-2] $ redis-cli PING @@ -399,7 +399,7 @@ Debug = true [stage-30] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-2] OK received. [stage-30] [replica-2] $ redis-cli PSYNC ? -1 -[stage-30] [replica-2] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. +[stage-30] [replica-2] FULLRESYNC 3b9efc970d4fc292a031c15a048f3ee0af940922 0 received. [stage-30] [replica-2] Successfully received RDB file from master. [stage-30] Creating replica : 2. [stage-30] [replica-3] $ redis-cli PING @@ -407,7 +407,7 @@ Debug = true [stage-30] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-3] OK received. [stage-30] [replica-3] $ redis-cli PSYNC ? -1 -[stage-30] [replica-3] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. +[stage-30] [replica-3] FULLRESYNC 3b9efc970d4fc292a031c15a048f3ee0af940922 0 received. [stage-30] [replica-3] Successfully received RDB file from master. [stage-30] Creating replica : 3. [stage-30] [replica-4] $ redis-cli PING @@ -415,7 +415,7 @@ Debug = true [stage-30] [replica-4] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-4] OK received. [stage-30] [replica-4] $ redis-cli PSYNC ? -1 -[stage-30] [replica-4] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. +[stage-30] [replica-4] FULLRESYNC 3b9efc970d4fc292a031c15a048f3ee0af940922 0 received. [stage-30] [replica-4] Successfully received RDB file from master. [stage-30] Creating replica : 4. [stage-30] [replica-5] $ redis-cli PING @@ -423,7 +423,7 @@ Debug = true [stage-30] [replica-5] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-5] OK received. [stage-30] [replica-5] $ redis-cli PSYNC ? -1 -[stage-30] [replica-5] FULLRESYNC 59e4df569ae689e82363b2ed3e0d49fc01290ffe 0 received. +[stage-30] [replica-5] FULLRESYNC 3b9efc970d4fc292a031c15a048f3ee0af940922 0 received. [stage-30] [replica-5] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 [stage-30] [client] 5 received. diff --git a/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass b/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass index c69bbbe3..316a35e4 100644 --- a/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass +++ b/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:46:12.962) -[stage-7] $ redis-cli get grapes (sent at 17:46:12.962, key should not be expired) +[stage-7] Received OK (at 17:07:48.848) +[stage-7] $ redis-cli get grapes (sent at 17:07:48.848, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:46:13.064, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:07:48.950, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles546426643 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3519391358 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3006361094 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles902725017 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4071477655 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3773027318 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2015185639 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1895658178 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2657903288 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles324726093 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3676437565 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2578057413 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC 6512050bdddbd5bfec09bb60cebe296218603497 0 received. +[stage-22] FULLRESYNC 4ce8130242d3b3885b3189a3a07a4f07cab2ecde 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC 295f04587c25c328fa3fe847d46dbbf807d01dd0 0 received. +[stage-23] FULLRESYNC c9b5a25766536ed828f170edb494cfde7c4ac0b6 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC 05106ed850ff3082b97a53bbc1c25df4088bd01d 0 received. +[stage-24] FULLRESYNC 4b0cc75a8a82bdeb2e1941ee0f2eb82e847bd32c 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. +[stage-25] [replica-1] FULLRESYNC 782634e10820e0b83ce38977f73e640060aa0bbe 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. +[stage-25] [replica-2] FULLRESYNC 782634e10820e0b83ce38977f73e640060aa0bbe 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC 7a55e391a52ce605458265b3ad155b59c721e7ad 0 received. +[stage-25] [replica-3] FULLRESYNC 782634e10820e0b83ce38977f73e640060aa0bbe 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 diff --git a/internal/test_helpers/fixtures/repl-wait/pass b/internal/test_helpers/fixtures/repl-wait/pass index 0c98e0dc..5040ed4d 100644 --- a/internal/test_helpers/fixtures/repl-wait/pass +++ b/internal/test_helpers/fixtures/repl-wait/pass @@ -69,17 +69,17 @@ Debug = true [stage-7] Running tests for Stage #7: expiry [stage-7] $ ./spawn_redis_server.sh [stage-7] $ redis-cli set grapes apples px 100 -[stage-7] Received OK (at 17:45:38.531) -[stage-7] $ redis-cli get grapes (sent at 17:45:38.531, key should not be expired) +[stage-7] Received OK (at 17:06:49.163) +[stage-7] $ redis-cli get grapes (sent at 17:06:49.163, key should not be expired) [stage-7] Received "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 17:45:38.633, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 17:06:49.264, key should be expired) [stage-7] Test passed. [stage-7] Terminating program [stage-7] Program terminated successfully [stage-8] Running tests for Stage #8: rdb-config -[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2255389461 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4243262563 --dbfilename banana.rdb [stage-8] $ redis-cli CONFIG GET dir [stage-8] Test passed. [stage-8] Terminating program @@ -87,7 +87,7 @@ Debug = true [stage-9] Running tests for Stage #9: rdb-read-key [stage-9] Created RDB file with single key: "pear" -[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1772531090 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles790502522 --dbfilename blueberry.rdb [stage-9] $ redis-cli KEYS * [stage-9] Test passed. [stage-9] Terminating program @@ -95,7 +95,7 @@ Debug = true [stage-10] Running tests for Stage #10: rdb-read-string-value [stage-10] Created RDB file with single key-value pair: strawberry="apple" -[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1073171776 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2463172116 --dbfilename banana.rdb [stage-10] $ redis-cli GET strawberry [stage-10] Test passed. [stage-10] Terminating program @@ -103,7 +103,7 @@ Debug = true [stage-11] Running tests for Stage #11: rdb-read-multiple-keys [stage-11] Created RDB file with 5 keys: ["orange" "blueberry" "strawberry" "pineapple" "banana"] -[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3082845662 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3995950742 --dbfilename pear.rdb [stage-11] $ redis-cli KEYS * [stage-11] Test passed. [stage-11] Terminating program @@ -111,7 +111,7 @@ Debug = true [stage-12] Running tests for Stage #12: rdb-read-multiple-string-values [stage-12] Created RDB file with key-value pairs: "orange"="grape", "mango"="pear", "grape"="blueberry", "pear"="pineapple" -[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles421922709 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles45124143 --dbfilename apple.rdb [stage-12] $ redis-cli GET orange [stage-12] $ redis-cli GET mango [stage-12] $ redis-cli GET grape @@ -121,7 +121,7 @@ Debug = true [stage-12] Error terminating program: 'program failed to exit in 2 seconds after receiving sigterm' [stage-13] Running tests for Stage #13: rdb-read-value-with-expiry -[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1118073483 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4195103772 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -214,7 +214,7 @@ Debug = true [stage-22] $ redis-cli REPLCONF listening-port 6380 [stage-22] OK received. [stage-22] $ redis-cli PSYNC ? -1 -[stage-22] FULLRESYNC a69a6e3bf38afe7ff50bac22eea0d16f08eab5fa 0 received. +[stage-22] FULLRESYNC 0f36295bdfa9fc4f08738347c0820b7ce93f9635 0 received. [stage-22] Test passed. [stage-22] Terminating program [stage-22] Program terminated successfully @@ -226,7 +226,7 @@ Debug = true [stage-23] $ redis-cli REPLCONF listening-port 6380 [stage-23] OK received. [stage-23] $ redis-cli PSYNC ? -1 -[stage-23] FULLRESYNC c2df559ffac98f5b63a5c62aa23d8613f7ddd4d6 0 received. +[stage-23] FULLRESYNC 8421ca0c0bcafdf7873b01b1602e5a6efda13818 0 received. [stage-23] Successfully received RDB file from master. [stage-23] Test passed. [stage-23] Terminating program @@ -239,7 +239,7 @@ Debug = true [stage-24] $ redis-cli REPLCONF listening-port 6380 [stage-24] OK received. [stage-24] $ redis-cli PSYNC ? -1 -[stage-24] FULLRESYNC b5bc3a8f3b5fa1ec73f6ce6c8bd054f952b75f55 0 received. +[stage-24] FULLRESYNC 0cac57074c7e68c5368ac400232476359601bfb1 0 received. [stage-24] Successfully received RDB file from master. [stage-24] Setting key foo to 123 [stage-24] $ redis-cli SET foo 123 @@ -262,21 +262,21 @@ Debug = true [stage-25] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-1] OK received. [stage-25] [replica-1] $ redis-cli PSYNC ? -1 -[stage-25] [replica-1] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. +[stage-25] [replica-1] FULLRESYNC da4290e4105e080d9e79fb19cd4146bab7d8f20a 0 received. [stage-25] [replica-1] Successfully received RDB file from master. [stage-25] [replica-2] $ redis-cli PING [stage-25] [replica-2] PONG received. [stage-25] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-2] OK received. [stage-25] [replica-2] $ redis-cli PSYNC ? -1 -[stage-25] [replica-2] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. +[stage-25] [replica-2] FULLRESYNC da4290e4105e080d9e79fb19cd4146bab7d8f20a 0 received. [stage-25] [replica-2] Successfully received RDB file from master. [stage-25] [replica-3] $ redis-cli PING [stage-25] [replica-3] PONG received. [stage-25] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-25] [replica-3] OK received. [stage-25] [replica-3] $ redis-cli PSYNC ? -1 -[stage-25] [replica-3] FULLRESYNC fb51c50703837bf05a908eda58ba508b1628a169 0 received. +[stage-25] [replica-3] FULLRESYNC da4290e4105e080d9e79fb19cd4146bab7d8f20a 0 received. [stage-25] [replica-3] Successfully received RDB file from master. [stage-25] [client] Setting key foo to 123 [stage-25] [client] $ redis-cli SET foo 123 @@ -391,7 +391,7 @@ Debug = true [stage-30] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-1] OK received. [stage-30] [replica-1] $ redis-cli PSYNC ? -1 -[stage-30] [replica-1] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. +[stage-30] [replica-1] FULLRESYNC ef7e622840030ff99ed745a0a2cda0c930502933 0 received. [stage-30] [replica-1] Successfully received RDB file from master. [stage-30] Creating replica : 1. [stage-30] [replica-2] $ redis-cli PING @@ -399,7 +399,7 @@ Debug = true [stage-30] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-2] OK received. [stage-30] [replica-2] $ redis-cli PSYNC ? -1 -[stage-30] [replica-2] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. +[stage-30] [replica-2] FULLRESYNC ef7e622840030ff99ed745a0a2cda0c930502933 0 received. [stage-30] [replica-2] Successfully received RDB file from master. [stage-30] Creating replica : 2. [stage-30] [replica-3] $ redis-cli PING @@ -407,7 +407,7 @@ Debug = true [stage-30] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-3] OK received. [stage-30] [replica-3] $ redis-cli PSYNC ? -1 -[stage-30] [replica-3] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. +[stage-30] [replica-3] FULLRESYNC ef7e622840030ff99ed745a0a2cda0c930502933 0 received. [stage-30] [replica-3] Successfully received RDB file from master. [stage-30] Creating replica : 3. [stage-30] [replica-4] $ redis-cli PING @@ -415,7 +415,7 @@ Debug = true [stage-30] [replica-4] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-4] OK received. [stage-30] [replica-4] $ redis-cli PSYNC ? -1 -[stage-30] [replica-4] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. +[stage-30] [replica-4] FULLRESYNC ef7e622840030ff99ed745a0a2cda0c930502933 0 received. [stage-30] [replica-4] Successfully received RDB file from master. [stage-30] Creating replica : 4. [stage-30] [replica-5] $ redis-cli PING @@ -423,7 +423,7 @@ Debug = true [stage-30] [replica-5] $ redis-cli REPLCONF listening-port 6380 [stage-30] [replica-5] OK received. [stage-30] [replica-5] $ redis-cli PSYNC ? -1 -[stage-30] [replica-5] FULLRESYNC 5aedc903f8404f167383fb0482bed62528c6ca72 0 received. +[stage-30] [replica-5] FULLRESYNC ef7e622840030ff99ed745a0a2cda0c930502933 0 received. [stage-30] [replica-5] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 [stage-30] [client] 5 received. @@ -448,7 +448,7 @@ Debug = true [stage-31] [replica-1] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-1] OK received. [stage-31] [replica-1] $ redis-cli PSYNC ? -1 -[stage-31] [replica-1] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. +[stage-31] [replica-1] FULLRESYNC 0af192a69d90cd8e69725af7bc2ec3b82471f713 0 received. [stage-31] [replica-1] Successfully received RDB file from master. [stage-31] Creating replica : 2. [stage-31] [replica-2] $ redis-cli PING @@ -456,7 +456,7 @@ Debug = true [stage-31] [replica-2] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-2] OK received. [stage-31] [replica-2] $ redis-cli PSYNC ? -1 -[stage-31] [replica-2] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. +[stage-31] [replica-2] FULLRESYNC 0af192a69d90cd8e69725af7bc2ec3b82471f713 0 received. [stage-31] [replica-2] Successfully received RDB file from master. [stage-31] Creating replica : 3. [stage-31] [replica-3] $ redis-cli PING @@ -464,7 +464,7 @@ Debug = true [stage-31] [replica-3] $ redis-cli REPLCONF listening-port 6380 [stage-31] [replica-3] OK received. [stage-31] [replica-3] $ redis-cli PSYNC ? -1 -[stage-31] [replica-3] FULLRESYNC 1788ee6fdca8f479daac54c81fc9df7b7cb84bb7 0 received. +[stage-31] [replica-3] FULLRESYNC 0af192a69d90cd8e69725af7bc2ec3b82471f713 0 received. [stage-31] [replica-3] Successfully received RDB file from master. [stage-31] [client] $ redis-cli SET foo 123 [stage-31] [client] $ redis-cli WAIT 1 500 @@ -480,16 +480,18 @@ Debug = true [stage-31] [replica-1] $ redis-cli REPLCONF ACK 111 [stage-31] [client] 1 received. [stage-31] [client] $ redis-cli SET baz 789 -[stage-31] [client] $ redis-cli WAIT 2 2000 +[stage-31] [client] $ redis-cli WAIT 4 2000 [stage-31] [replica-1] SET baz 789 received. [stage-31] [replica-1] REPLCONF GETACK * received. +[stage-31] [replica-1] $ redis-cli REPLCONF ACK 179 [stage-31] [replica-2] SET baz 789 received. [stage-31] [replica-2] REPLCONF GETACK * received. +[stage-31] [replica-2] $ redis-cli REPLCONF ACK 179 [stage-31] [replica-3] SET baz 789 received. [stage-31] [replica-3] REPLCONF GETACK * received. -[stage-31] [replica-1] $ redis-cli REPLCONF ACK 179 -[stage-31] [client] 1 received. -[stage-31] [client] WAIT command returned after 2004 ms +[stage-31] [replica-3] $ redis-cli REPLCONF ACK 179 +[stage-31] [client] 3 received. +[stage-31] [client] WAIT command returned after 2003 ms [stage-31] Test passed. [stage-31] Terminating program [stage-31] Program terminated successfully