From 71d73b673fecaee7974a21ef397c7d0e1d560bd8 Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Sun, 11 Feb 2024 11:42:22 +0000 Subject: [PATCH 1/3] Connecting to master is optional in Stage 3. Add timeout and skip if connection not made. --- internal/test_repl_info_replica.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/internal/test_repl_info_replica.go b/internal/test_repl_info_replica.go index 2cafc668..0fa1724e 100644 --- a/internal/test_repl_info_replica.go +++ b/internal/test_repl_info_replica.go @@ -4,6 +4,7 @@ import ( "fmt" "net" "strings" + "time" testerutils "github.com/codecrafters-io/tester-utils" ) @@ -28,8 +29,17 @@ func testReplInfoReplica(stageHarness *testerutils.StageHarness) error { return err } - conn, err := listener.Accept() + timeout := 2 * time.Second + err = listener.(*net.TCPListener).SetDeadline(time.Now().Add(timeout)) if err != nil { + fmt.Println("Error setting deadline:", err.Error()) + return err + } + + conn, err := listener.Accept() + if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() { + // Connecting to master in this stage is optional. + } else if err != nil { fmt.Println("Error accepting: ", err.Error()) return err } From 3707e2fa428c89c20256b1dc6aeb977bbffe0915 Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Sun, 11 Feb 2024 16:48:47 +0000 Subject: [PATCH 2/3] Instead of timeout, start goroutine to accept connections and perform handshake in the bg. --- internal/test_repl_info_replica.go | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/test_repl_info_replica.go b/internal/test_repl_info_replica.go index 0fa1724e..2188dff3 100644 --- a/internal/test_repl_info_replica.go +++ b/internal/test_repl_info_replica.go @@ -4,9 +4,9 @@ import ( "fmt" "net" "strings" - "time" testerutils "github.com/codecrafters-io/tester-utils" + loggerutils "github.com/codecrafters-io/tester-utils/logger" ) func testReplInfoReplica(stageHarness *testerutils.StageHarness) error { @@ -29,20 +29,22 @@ func testReplInfoReplica(stageHarness *testerutils.StageHarness) error { return err } - timeout := 2 * time.Second - err = listener.(*net.TCPListener).SetDeadline(time.Now().Add(timeout)) - if err != nil { - fmt.Println("Error setting deadline:", err.Error()) - return err - } - - conn, err := listener.Accept() - if opErr, ok := err.(*net.OpError); ok && opErr.Timeout() { + go func(l net.Listener) error { // Connecting to master in this stage is optional. - } else if err != nil { - fmt.Println("Error accepting: ", err.Error()) - return err - } + conn, err := listener.Accept() + if err != nil { + logger.Debugf("Error accepting: %s", err.Error()) + return err + } + + quietLogger := loggerutils.GetQuietLogger("") + master := NewFakeRedisMaster(conn, quietLogger) + master.Handshake() + + conn.Close() + return nil + }(listener) + client := NewRedisClient("localhost:6380") logger.Infof("$ redis-cli INFO replication") @@ -66,6 +68,5 @@ func testReplInfoReplica(stageHarness *testerutils.StageHarness) error { } client.Close() - conn.Close() return nil } From f1c16093f864b2ff8c010838f60fa6ab4e31f53b Mon Sep 17 00:00:00 2001 From: Ryan Gang Date: Sun, 11 Feb 2024 16:54:19 +0000 Subject: [PATCH 3/3] Add updated 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 | 34 +++---- .../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 | 26 +++--- .../fixtures/repl-master-psync-rdb/pass | 24 ++--- .../fixtures/repl-master-psync/pass | 22 ++--- .../fixtures/repl-master-replconf/pass | 20 ++--- .../fixtures/repl-multiple-replicas/pass | 32 +++---- .../fixtures/repl-replica-getack-nonzero/pass | 44 ++++----- .../fixtures/repl-replica-getack/pass | 36 ++++---- .../fixtures/repl-replica-ping/pass | 18 ++-- .../fixtures/repl-replica-psync/pass | 20 ++--- .../fixtures/repl-replica-replconf/pass | 18 ++-- .../fixtures/repl-wait-zero-offset/pass | 78 ++++++++++------ .../fixtures/repl-wait-zero-replicas/pass | 44 ++++----- internal/test_helpers/fixtures/repl-wait/pass | 90 +++++++++++-------- 27 files changed, 352 insertions(+), 314 deletions(-) diff --git a/internal/stages_test.go b/internal/stages_test.go index 6d131a62..b8d94cb9 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 d1beeb1c..8843d927 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 10:51:24.791) -[stage-7] $ redis-cli get grapes (sent at 10:51:24.791, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:51:24.893, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:26:05.774, 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 150ade52..455dd3da 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:36926->127.0.0.1:6379: read: connection reset by peer +[stage-2] read tcp 127.0.0.1:47322->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 c92684e4..623619dd 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 10:45:55.221) -[stage-7] $ redis-cli get grapes (sent at 10:45:55.221, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:45:55.322, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:27:33.954, 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/rdbfiles2453435298 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4245072751 --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 f9ac8c93..eb54df52 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 10:46:00.269) -[stage-7] $ redis-cli get grapes (sent at 10:46:00.269, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:46:00.370, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:32:15.993, 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/rdbfiles2663685552 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3880749550 --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/rdbfiles2112653960 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4179904341 --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 30af9472..75cb2cf6 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 10:48:17.472) -[stage-7] $ redis-cli get grapes (sent at 10:48:17.472, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:48:17.573, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:27:39.012, 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/rdbfiles4213548725 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2385476531 --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/rdbfiles2764557421 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles537073336 --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/rdbfiles357388602 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3077309834 --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/rdbfiles604186444 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3755854538 --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 215e069e..a1710770 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 10:51:27.722) -[stage-7] $ redis-cli get grapes (sent at 10:51:27.722, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:51:27.823, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:26:11.838, 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/rdbfiles4154756338 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3200217314 --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/rdbfiles2588948210 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3726916059 --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/rdbfiles1250161541 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles514194738 --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/rdbfiles2275471340 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles418699697 --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/rdbfiles3718936964 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1938215963 --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 e5737fdf..fbeb926a 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 10:46:07.415) -[stage-7] $ redis-cli get grapes (sent at 10:46:07.415, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:46:07.516, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:26:25.307, 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/rdbfiles1326260254 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4038037800 --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/rdbfiles1089935667 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles817889673 --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/rdbfiles184674477 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3156628814 --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/rdbfiles3073674735 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles189452306 --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/rdbfiles2582547524 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles486173548 --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/rdbfiles356209747 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2461329809 --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 d2c79021..16d05dd6 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 10:48:08.219) -[stage-7] $ redis-cli get grapes (sent at 10:48:08.219, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:48:08.320, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:25:39.895, 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/rdbfiles421878518 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3309788375 --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/rdbfiles3236821878 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3558757520 --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/rdbfiles3243568350 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2982602036 --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 6996cca3..3c4cb3bd 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 10:47:47.088) -[stage-7] $ redis-cli get grapes (sent at 10:47:47.088, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:47:47.190, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:27:14.902, 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/rdbfiles1933221632 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2585431942 --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/rdbfiles1915907847 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles795095690 --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/rdbfiles346002835 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3188313527 --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/rdbfiles3599215975 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1098810603 --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/rdbfiles964701836 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles31920035 --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/rdbfiles904393124 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles549103665 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 bd4d6f7858e38892ac96f40828e80a4bf9777d8d 0 received. +[stage-22] FULLRESYNC 414e6885c92253e84e39eab7536cb2b5df0ef0ff 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 c5b5653fca05ebfaf49ce0b832b507e24ff475a6 0 received. +[stage-23] FULLRESYNC 86b7884b574f87dbc2d44589d9dc70ac70ca1e14 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 32bb2f6b7380b476416acb1658068cd6573fb4f4 0 received. +[stage-24] FULLRESYNC ce1271bd597edd555c721b3e92b635a3ea6724c5 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 9fc0602c7046d5a7b3d3fff26955b51fead265bb 0 received. +[stage-25] [replica-1] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 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 9fc0602c7046d5a7b3d3fff26955b51fead265bb 0 received. +[stage-25] [replica-2] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 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 9fc0602c7046d5a7b3d3fff26955b51fead265bb 0 received. +[stage-25] [replica-3] FULLRESYNC 0668012f862cfd4d85083beb8ab7db4c353810da 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 diff --git a/internal/test_helpers/fixtures/repl-custom-port/pass b/internal/test_helpers/fixtures/repl-custom-port/pass index d68cadb3..7f404494 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 10:46:22.975) -[stage-7] $ redis-cli get grapes (sent at 10:46:22.975, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:46:23.077, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:25:49.153, 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/rdbfiles2882732831 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4011913093 --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/rdbfiles2572372115 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles821574099 --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/rdbfiles3311037097 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3739119394 --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/rdbfiles1807573295 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2033357338 --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/rdbfiles3406569281 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3769079571 --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/rdbfiles1313926574 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2255566758 --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 4374643f..6f40e4ee 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 10:49:25.125) -[stage-7] $ redis-cli get grapes (sent at 10:49:25.125, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:49:25.227, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:25:22.872, 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/rdbfiles1347588020 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3287183874 --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/rdbfiles316610407 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1045973770 --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/rdbfiles4200246040 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2180453928 --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/rdbfiles3333836963 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3310792369 --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/rdbfiles1759190986 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles399624370 --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/rdbfiles486567807 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2320476593 --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 5bf251a9..1200c6b1 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 10:51:41.178) -[stage-7] $ redis-cli get grapes (sent at 10:51:41.178, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:51:41.279, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:27:50.380, 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/rdbfiles1709568523 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3414732450 --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/rdbfiles1883410425 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles706872412 --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/rdbfiles1624267944 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1215146242 --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/rdbfiles415892923 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2347342152 --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/rdbfiles3760740507 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3159280433 --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/rdbfiles3598930239 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3953673255 --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 d9b77023..a9500690 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 10:46:39.570) -[stage-7] $ redis-cli get grapes (sent at 10:46:39.570, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:46:39.672, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:26:40.871, 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/rdbfiles2983708772 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4276800343 --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/rdbfiles3299037804 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1012990278 --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/rdbfiles198460322 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2489881793 --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/rdbfiles838952700 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2286863220 --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/rdbfiles1154062030 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1737277580 --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/rdbfiles2365370446 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles700916809 --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 89f55fee..a2fc134b 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 10:50:21.840) -[stage-7] $ redis-cli get grapes (sent at 10:50:21.840, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:50:21.941, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:31:42.611, 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/rdbfiles2818756618 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles815388135 --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/rdbfiles2171241311 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4154065145 --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/rdbfiles1839089670 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3275451732 --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/rdbfiles3579710366 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1339209009 --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/rdbfiles3575466312 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1492443661 --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/rdbfiles3331502206 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1207320348 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 81854cd9e76533aa8b23ac2a2cde8d4f1c9a2c21 0 received. +[stage-22] FULLRESYNC 2cf81b3854faa6a2e91163a0d5721cdd67d38889 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 091fb579c086bb64b205444f451d9e9a8699b0e2 0 received. +[stage-23] FULLRESYNC fb742417a37f2b78fffe312df4be6dabf9a74c99 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 19558daab823a36f595466c079b5ccec680f8bda 0 received. +[stage-24] FULLRESYNC b524bba3aa570ccfb02e10b16e5b43a232c3517f 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 9c863446..2bb42f6c 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 10:48:46.209) -[stage-7] $ redis-cli get grapes (sent at 10:48:46.209, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:48:46.310, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:29:13.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/rdbfiles1887325316 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1760842190 --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/rdbfiles3508868730 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1444017535 --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/rdbfiles3001734693 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2212413569 --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/rdbfiles186279274 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3644388544 --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/rdbfiles463012375 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles575487084 --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/rdbfiles2745829952 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles764469797 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 69b79c26518fa9a80dc8a2e59c76cad265810c27 0 received. +[stage-22] FULLRESYNC ee09abebf1e9a71949ffdc7d7a68e62e63c28ce2 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 ea0b447e679bd7347a02d3a70a7f54a786352a45 0 received. +[stage-23] FULLRESYNC fb9fa8f2e5ee99345b1bd746ff07404f6c2ea370 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 747da164..b1b63807 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 10:47:29.436) -[stage-7] $ redis-cli get grapes (sent at 10:47:29.436, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:47:29.538, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:31:24.902, 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/rdbfiles1342319818 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles235310941 --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/rdbfiles446726773 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1404183815 --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/rdbfiles2409605701 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2786869738 --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/rdbfiles3939128238 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2697767959 --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/rdbfiles627049487 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3590816161 --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/rdbfiles716295556 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4237431452 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 cad9f2386bdac41e0565f1ef73ec65167d94f9ea 0 received. +[stage-22] FULLRESYNC 084a9dc81102921b23cf5cbfc37ba1e5e54bdb46 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 df023df2..9e64f395 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 10:51:58.036) -[stage-7] $ redis-cli get grapes (sent at 10:51:58.036, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:51:58.138, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:31:07.328, 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/rdbfiles3360814586 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3556820796 --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/rdbfiles424363481 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2876082002 --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/rdbfiles2133847382 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3471627663 --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/rdbfiles1141866467 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2526723552 --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/rdbfiles2056891136 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles284446884 --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/rdbfiles1341095283 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles501559455 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-multiple-replicas/pass b/internal/test_helpers/fixtures/repl-multiple-replicas/pass index be287b40..cd245dd7 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 10:52:15.546) -[stage-7] $ redis-cli get grapes (sent at 10:52:15.546, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:52:15.648, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:29:31.184, 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/rdbfiles3323406218 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles695361141 --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/rdbfiles1034596733 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2680232014 --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/rdbfiles2798370821 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles877152066 --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/rdbfiles1348336127 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1369157898 --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/rdbfiles3178976370 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles403947166 --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/rdbfiles194116388 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles669823371 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 a255cc0c647bbe004dfdc75981d63bc23d2eaec2 0 received. +[stage-22] FULLRESYNC 7599f887dd7945accf992314b05cf17750696e7f 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 84d2c0cb8857d12631dba525bbe0a102a39ac8d4 0 received. +[stage-23] FULLRESYNC 42810049abdbe43c4b049b6b2f9e8e148e53d98a 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 893b352d624957bb4b34105e58156a9d65b98a49 0 received. +[stage-24] FULLRESYNC c7cc861f4236cf41a193518b69cd1f5292b184fd 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 193c4396bdf9025b289f75e227472c67c056d365 0 received. +[stage-25] [replica-1] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 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 193c4396bdf9025b289f75e227472c67c056d365 0 received. +[stage-25] [replica-2] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 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 193c4396bdf9025b289f75e227472c67c056d365 0 received. +[stage-25] [replica-3] FULLRESYNC a6d1b559f6f83cbd97cd9307d1125b422ecc4de6 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 cf567811..a7cfc269 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 10:49:42.120) -[stage-7] $ redis-cli get grapes (sent at 10:49:42.120, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:49:42.221, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:29:50.104, 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/rdbfiles2158986120 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles496028966 --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/rdbfiles1251748291 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles242027416 --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/rdbfiles681299593 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles518465251 --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/rdbfiles3775977615 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles580073728 --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/rdbfiles3395223618 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1915911637 --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/rdbfiles2742989410 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3255760112 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 3505108274977ecada8c87d429cc792e66dbb848 0 received. +[stage-22] FULLRESYNC ac29f0e05ba22a77e18645b02cdea35c2f0ce931 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 73b06d50adf32242060613f3c8edec8aed919cf7 0 received. +[stage-23] FULLRESYNC 7d172465450bb2fe1ef3eb0cbcc44f0c560e9f79 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 fa866c2ebfeff19e55ca76866c1a041575a3a1cb 0 received. +[stage-24] FULLRESYNC b264c3dfd907869fdcf06936cc8ca32a64205d10 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 10778fd6189d801ef50a5cab3b32a974a73e2dba 0 received. +[stage-25] [replica-1] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 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 10778fd6189d801ef50a5cab3b32a974a73e2dba 0 received. +[stage-25] [replica-2] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 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 10778fd6189d801ef50a5cab3b32a974a73e2dba 0 received. +[stage-25] [replica-3] FULLRESYNC a93782cac84a270ba96517083017c94aa0b6da64 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 @@ -341,7 +341,7 @@ Debug = true [stage-27] REPLCONF capa eof capa psync2 received. [stage-27] +OK sent. [stage-27] PSYNC ? -1 received. -[stage-27] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. +[stage-27] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. [stage-27] RDB file sent. [stage-27] $ redis-cli REPLCONF GETACK * [stage-27] REPLCONF ACK 0 received. @@ -359,17 +359,17 @@ Debug = true [stage-28] REPLCONF capa eof capa psync2 received. [stage-28] +OK sent. [stage-28] PSYNC ? -1 received. -[stage-28] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. +[stage-28] +FULLRESYNC nva872qjcyc9x2nr05gyntwlkwcbwjzrikxq29ya 0 sent. [stage-28] RDB file sent. [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 0 received. [stage-28] $ redis-cli PING [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 51 received. -[stage-28] $ redis-cli SET va872qjcy 9x2nr05gyn -[stage-28] $ redis-cli SET wlkwcbwjz ikxq29y +[stage-28] $ redis-cli SET 2lzk6sl3zm6fr8k0 1neo85mamg +[stage-28] $ redis-cli SET 1t3opy bottjn7crua7i6b [stage-28] $ redis-cli REPLCONF GETACK * -[stage-28] REPLCONF ACK 174 received. +[stage-28] REPLCONF ACK 188 received. [stage-28] Test passed. [stage-28] Terminating program [stage-28] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-replica-getack/pass b/internal/test_helpers/fixtures/repl-replica-getack/pass index 5bb5de61..2ae766ec 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 10:50:40.172) -[stage-7] $ redis-cli get grapes (sent at 10:50:40.172, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:50:40.273, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:28:07.263, 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/rdbfiles1001924526 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles817367463 --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/rdbfiles3999635293 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1981694510 --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/rdbfiles3036517165 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2270058779 --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/rdbfiles3503936005 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3318145405 --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/rdbfiles1201803242 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3725340140 --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/rdbfiles1322043153 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1001712302 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 4494cea20159426d786caf0c5a6b2080a2cfef5c 0 received. +[stage-22] FULLRESYNC 01a51ef2717e1a94b5a1003f9b0c8c6c702bdcc9 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 d825995a2df2f4126df446858f58e37e3aaddf40 0 received. +[stage-23] FULLRESYNC b652946d5e3edc80cb25ca5c30740cd2d16c51ab 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 d49d7b4a6ec156a5452bf8ab79279ea158fa2a71 0 received. +[stage-24] FULLRESYNC 3e7f5ef294763fa3ac4de87a4aeb82692fbef354 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 f39fc61d74fad52b3e4e8ff9a5583e0f7af5f28d 0 received. +[stage-25] [replica-1] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 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 f39fc61d74fad52b3e4e8ff9a5583e0f7af5f28d 0 received. +[stage-25] [replica-2] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 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 f39fc61d74fad52b3e4e8ff9a5583e0f7af5f28d 0 received. +[stage-25] [replica-3] FULLRESYNC efc5fbc7562fd1f91490bf3ccdd5bc5dce1db4dd 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 @@ -341,7 +341,7 @@ Debug = true [stage-27] REPLCONF capa eof capa psync2 received. [stage-27] +OK sent. [stage-27] PSYNC ? -1 received. -[stage-27] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. +[stage-27] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. [stage-27] RDB file sent. [stage-27] $ redis-cli REPLCONF GETACK * [stage-27] REPLCONF ACK 0 received. diff --git a/internal/test_helpers/fixtures/repl-replica-ping/pass b/internal/test_helpers/fixtures/repl-replica-ping/pass index b0a0b2d6..a91c723e 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 10:47:12.310) -[stage-7] $ redis-cli get grapes (sent at 10:47:12.310, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:47:12.411, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:30:50.164, 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/rdbfiles2927802943 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3444256582 --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/rdbfiles2540082900 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles227187650 --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/rdbfiles3345932044 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2377482709 --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/rdbfiles143574727 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2202004223 --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/rdbfiles3215438071 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles839046873 --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/rdbfiles2100532742 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3769068849 --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 b83792e4..2f7e9539 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 10:48:28.821) -[stage-7] $ redis-cli get grapes (sent at 10:48:28.821, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:48:28.922, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:30:11.546, 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/rdbfiles3805255537 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles350213682 --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/rdbfiles946725060 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2668448713 --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/rdbfiles1109306350 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2379083229 --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/rdbfiles48799833 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2410802832 --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/rdbfiles3522603128 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1230512208 --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/rdbfiles1733903215 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2038647893 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-replica-replconf/pass b/internal/test_helpers/fixtures/repl-replica-replconf/pass index 2723a177..2fc6a61c 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 10:52:36.907) -[stage-7] $ redis-cli get grapes (sent at 10:52:36.907, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:52:37.008, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:26:57.619, 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/rdbfiles2911978931 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1333443561 --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/rdbfiles3058861951 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3823059875 --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/rdbfiles3831191099 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3861126753 --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/rdbfiles2205157922 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2086923055 --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/rdbfiles3245847400 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1811636817 --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/rdbfiles1068862767 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles7135806 --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 6a6c06f9..4604b0c6 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 10:49:04.195) -[stage-7] $ redis-cli get grapes (sent at 10:49:04.196, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:49:04.297, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:30:28.962, 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/rdbfiles3549294347 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3634131871 --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/rdbfiles2472598299 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3317428780 --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/rdbfiles1727468728 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles138355963 --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/rdbfiles3878580143 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1275818168 --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/rdbfiles65906057 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles878420060 --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/rdbfiles3217031916 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1774391523 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 2f32dc21cf001f60b5bae505d7af1b37ee70f377 0 received. +[stage-22] FULLRESYNC 89689b309cdea8ec0028f0f20063ab9a996d63e7 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 d629cbeda6539c70a7181086854cc0a94e86eb39 0 received. +[stage-23] FULLRESYNC 758a594d20ff2e25bb321189291dae8319f61ce3 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 6d66054cd53e0a012225225e0fd32c03552583f7 0 received. +[stage-24] FULLRESYNC 9e02d0f657ac4cfe3c11c19791140b867618ca20 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 9068eaa9a98858f4a138ec008d7d03928512d7b1 0 received. +[stage-25] [replica-1] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 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 9068eaa9a98858f4a138ec008d7d03928512d7b1 0 received. +[stage-25] [replica-2] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 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 9068eaa9a98858f4a138ec008d7d03928512d7b1 0 received. +[stage-25] [replica-3] FULLRESYNC 2fb237a557faf993ab2887f47a26197e091f4291 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 @@ -341,7 +341,7 @@ Debug = true [stage-27] REPLCONF capa eof capa psync2 received. [stage-27] +OK sent. [stage-27] PSYNC ? -1 received. -[stage-27] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. +[stage-27] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. [stage-27] RDB file sent. [stage-27] $ redis-cli REPLCONF GETACK * [stage-27] REPLCONF ACK 0 received. @@ -359,17 +359,17 @@ Debug = true [stage-28] REPLCONF capa eof capa psync2 received. [stage-28] +OK sent. [stage-28] PSYNC ? -1 received. -[stage-28] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. +[stage-28] +FULLRESYNC nva872qjcyc9x2nr05gyntwlkwcbwjzrikxq29ya 0 sent. [stage-28] RDB file sent. [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 0 received. [stage-28] $ redis-cli PING [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 51 received. -[stage-28] $ redis-cli SET va872qjcy 9x2nr05gyn -[stage-28] $ redis-cli SET wlkwcbwjz ikxq29y +[stage-28] $ redis-cli SET 2lzk6sl3zm6fr8k0 1neo85mamg +[stage-28] $ redis-cli SET 1t3opy bottjn7crua7i6b [stage-28] $ redis-cli REPLCONF GETACK * -[stage-28] REPLCONF ACK 174 received. +[stage-28] REPLCONF ACK 188 received. [stage-28] Test passed. [stage-28] Terminating program [stage-28] Program terminated successfully @@ -384,14 +384,14 @@ Debug = true [stage-30] Running tests for Stage #30: repl-wait-zero-offset [stage-30] $ ./spawn_redis_server.sh --port 6379 -[stage-30] Proceeding to create 3 replicas. +[stage-30] Proceeding to create 5 replicas. [stage-30] Creating replica : 0. [stage-30] [replica-1] $ redis-cli PING [stage-30] [replica-1] PONG received. [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 12029ac390dfa2c5180b95cab12ce1b2c1a8f6bd 0 received. +[stage-30] [replica-1] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 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 12029ac390dfa2c5180b95cab12ce1b2c1a8f6bd 0 received. +[stage-30] [replica-2] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 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,14 +407,34 @@ 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 12029ac390dfa2c5180b95cab12ce1b2c1a8f6bd 0 received. +[stage-30] [replica-3] FULLRESYNC c13f34748c0245b845b6fe0f225d98cc12b9c901 0 received. [stage-30] [replica-3] Successfully received RDB file from master. +[stage-30] Creating replica : 3. +[stage-30] [replica-4] $ redis-cli PING +[stage-30] [replica-4] PONG received. +[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] Successfully received RDB file from master. +[stage-30] Creating replica : 4. +[stage-30] [replica-5] $ redis-cli PING +[stage-30] [replica-5] PONG received. +[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] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. [stage-30] [client] $ redis-cli WAIT 4 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. [stage-30] [client] $ redis-cli WAIT 5 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. +[stage-30] [client] $ redis-cli WAIT 6 500 +[stage-30] [client] 5 received. +[stage-30] [client] $ redis-cli WAIT 7 500 +[stage-30] [client] 5 received. [stage-30] Test passed. [stage-30] Terminating program [stage-30] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass b/internal/test_helpers/fixtures/repl-wait-zero-replicas/pass index 0dc714d1..c439615c 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 10:50:01.410) -[stage-7] $ redis-cli get grapes (sent at 10:50:01.410, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:50:01.511, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:28:26.442, 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/rdbfiles3763023271 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3365965963 --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/rdbfiles1106015633 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1387457436 --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/rdbfiles3945425010 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles597377667 --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/rdbfiles2604814890 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1515643356 --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/rdbfiles3708787077 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2101884143 --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/rdbfiles1796806387 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles340016108 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 1b6b3f63e0d2d5777ba731ebcd8a0e1e9cd0a53f 0 received. +[stage-22] FULLRESYNC f4b662d6c3e6de0cb07c2eb10b843d36f4b2bdf3 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 eaca25f11ca13aba9e40fc4db42726fb5e7f5064 0 received. +[stage-23] FULLRESYNC a3a7c373af5ad395851b40a29bb3e33d8668ec33 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 0294c1a5c306d065a6968ce413a74202ccbf0a58 0 received. +[stage-24] FULLRESYNC f3e81a337eead09be97e174328c548d0a7b350d6 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 1df6c6c79931e83ad4c93527bb19eebea9f3d423 0 received. +[stage-25] [replica-1] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 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 1df6c6c79931e83ad4c93527bb19eebea9f3d423 0 received. +[stage-25] [replica-2] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 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 1df6c6c79931e83ad4c93527bb19eebea9f3d423 0 received. +[stage-25] [replica-3] FULLRESYNC 947e6772b904dcf333640076d30dd10383a1d8e9 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 @@ -341,7 +341,7 @@ Debug = true [stage-27] REPLCONF capa eof capa psync2 received. [stage-27] +OK sent. [stage-27] PSYNC ? -1 received. -[stage-27] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. +[stage-27] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. [stage-27] RDB file sent. [stage-27] $ redis-cli REPLCONF GETACK * [stage-27] REPLCONF ACK 0 received. @@ -359,17 +359,17 @@ Debug = true [stage-28] REPLCONF capa eof capa psync2 received. [stage-28] +OK sent. [stage-28] PSYNC ? -1 received. -[stage-28] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. +[stage-28] +FULLRESYNC nva872qjcyc9x2nr05gyntwlkwcbwjzrikxq29ya 0 sent. [stage-28] RDB file sent. [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 0 received. [stage-28] $ redis-cli PING [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 51 received. -[stage-28] $ redis-cli SET va872qjcy 9x2nr05gyn -[stage-28] $ redis-cli SET wlkwcbwjz ikxq29y +[stage-28] $ redis-cli SET 2lzk6sl3zm6fr8k0 1neo85mamg +[stage-28] $ redis-cli SET 1t3opy bottjn7crua7i6b [stage-28] $ redis-cli REPLCONF GETACK * -[stage-28] REPLCONF ACK 174 received. +[stage-28] REPLCONF ACK 188 received. [stage-28] Test passed. [stage-28] Terminating program [stage-28] Program terminated successfully diff --git a/internal/test_helpers/fixtures/repl-wait/pass b/internal/test_helpers/fixtures/repl-wait/pass index 21bbd4c0..7188a69a 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 10:50:59.306) -[stage-7] $ redis-cli get grapes (sent at 10:50:59.306, key should not be expired) +[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 "apples" [stage-7] Sleeping for 101ms -[stage-7] $ redis-cli get grapes (sent at 10:50:59.407, key should be expired) +[stage-7] $ redis-cli get grapes (sent at 16:28:45.898, 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/rdbfiles1674740977 --dbfilename banana.rdb +[stage-8] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles2540450272 --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/rdbfiles4172299219 --dbfilename blueberry.rdb +[stage-9] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1976654656 --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/rdbfiles2953273321 --dbfilename banana.rdb +[stage-10] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1393016850 --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/rdbfiles1310761890 --dbfilename pear.rdb +[stage-11] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles1402371246 --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/rdbfiles3297524165 --dbfilename apple.rdb +[stage-12] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles3785220533 --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/rdbfiles250733769 --dbfilename apple.rdb +[stage-13] $ ./spawn_redis_server.sh --dir /tmp/rdbfiles4227093237 --dbfilename apple.rdb [stage-13] $ redis-cli GET pineapple [stage-13] $ redis-cli GET raspberry [stage-13] $ redis-cli GET blueberry @@ -192,7 +192,7 @@ Debug = true [stage-20] REPLCONF capa eof capa psync2 received. [stage-20] +OK sent. [stage-20] PSYNC ? -1 received. -[stage-20] +FULLRESYNC geld0qv199zhbfar8h86tnbtoyo71kaoazm44iv8 0 sent. +[stage-20] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. [stage-20] Test passed. [stage-20] Terminating program [stage-20] Program terminated successfully @@ -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 901cd3a0c4e4c12fb47cc3a3f24c293a2445dfa6 0 received. +[stage-22] FULLRESYNC 50edd65cbe5709dfc21b36f951a8be85350649f7 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 04dd71793876e03bf3c2a65c6130fd5371052c5c 0 received. +[stage-23] FULLRESYNC 270e6853ac0dd0f6fe0e1ac65b27c5ff8244dcd8 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 82738cc795218e3e1cbac8eef43a03ac4032bc84 0 received. +[stage-24] FULLRESYNC 38bd36e5f0f6827774d17ac1dc55c7407002355b 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 00de5a72c879a19ffbfd445c015af573dfeca33a 0 received. +[stage-25] [replica-1] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 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 00de5a72c879a19ffbfd445c015af573dfeca33a 0 received. +[stage-25] [replica-2] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 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 00de5a72c879a19ffbfd445c015af573dfeca33a 0 received. +[stage-25] [replica-3] FULLRESYNC 027acb4e32df0c376bbb5528b6d7f94958d6a8c2 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 @@ -313,7 +313,7 @@ Debug = true [stage-26] REPLCONF capa eof capa psync2 received. [stage-26] +OK sent. [stage-26] PSYNC ? -1 received. -[stage-26] +FULLRESYNC toaww545pepe0fpfdqujg57mpqkqpyemvrym9rdf 0 sent. +[stage-26] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. [stage-26] RDB file sent. [stage-26] $ redis-cli SET foo 123 [stage-26] $ redis-cli SET bar 456 @@ -341,7 +341,7 @@ Debug = true [stage-27] REPLCONF capa eof capa psync2 received. [stage-27] +OK sent. [stage-27] PSYNC ? -1 received. -[stage-27] +FULLRESYNC jvlugbetwxp9j5n1rimrcc7sekzl3lv3gnfybl3e 0 sent. +[stage-27] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. [stage-27] RDB file sent. [stage-27] $ redis-cli REPLCONF GETACK * [stage-27] REPLCONF ACK 0 received. @@ -359,17 +359,17 @@ Debug = true [stage-28] REPLCONF capa eof capa psync2 received. [stage-28] +OK sent. [stage-28] PSYNC ? -1 received. -[stage-28] +FULLRESYNC 37nphpuvaf6xx6wn7a9ohog1bmg9ibhpikkhmtr9 0 sent. +[stage-28] +FULLRESYNC nva872qjcyc9x2nr05gyntwlkwcbwjzrikxq29ya 0 sent. [stage-28] RDB file sent. [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 0 received. [stage-28] $ redis-cli PING [stage-28] $ redis-cli REPLCONF GETACK * [stage-28] REPLCONF ACK 51 received. -[stage-28] $ redis-cli SET va872qjcy 9x2nr05gyn -[stage-28] $ redis-cli SET wlkwcbwjz ikxq29y +[stage-28] $ redis-cli SET 2lzk6sl3zm6fr8k0 1neo85mamg +[stage-28] $ redis-cli SET 1t3opy bottjn7crua7i6b [stage-28] $ redis-cli REPLCONF GETACK * -[stage-28] REPLCONF ACK 174 received. +[stage-28] REPLCONF ACK 188 received. [stage-28] Test passed. [stage-28] Terminating program [stage-28] Program terminated successfully @@ -384,14 +384,14 @@ Debug = true [stage-30] Running tests for Stage #30: repl-wait-zero-offset [stage-30] $ ./spawn_redis_server.sh --port 6379 -[stage-30] Proceeding to create 3 replicas. +[stage-30] Proceeding to create 5 replicas. [stage-30] Creating replica : 0. [stage-30] [replica-1] $ redis-cli PING [stage-30] [replica-1] PONG received. [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 33261fd2850d69b6803c47f6a5ae36d99ba2db65 0 received. +[stage-30] [replica-1] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 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 33261fd2850d69b6803c47f6a5ae36d99ba2db65 0 received. +[stage-30] [replica-2] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 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,14 +407,34 @@ 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 33261fd2850d69b6803c47f6a5ae36d99ba2db65 0 received. +[stage-30] [replica-3] FULLRESYNC 60e4472114536e2f1ec89ab75205e447fced40d4 0 received. [stage-30] [replica-3] Successfully received RDB file from master. +[stage-30] Creating replica : 3. +[stage-30] [replica-4] $ redis-cli PING +[stage-30] [replica-4] PONG received. +[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] Successfully received RDB file from master. +[stage-30] Creating replica : 4. +[stage-30] [replica-5] $ redis-cli PING +[stage-30] [replica-5] PONG received. +[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] Successfully received RDB file from master. [stage-30] [client] $ redis-cli WAIT 3 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. [stage-30] [client] $ redis-cli WAIT 4 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. [stage-30] [client] $ redis-cli WAIT 5 500 -[stage-30] [client] 3 received. +[stage-30] [client] 5 received. +[stage-30] [client] $ redis-cli WAIT 6 500 +[stage-30] [client] 5 received. +[stage-30] [client] $ redis-cli WAIT 7 500 +[stage-30] [client] 5 received. [stage-30] Test passed. [stage-30] Terminating program [stage-30] Program terminated successfully @@ -428,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 0b0846db44656421a48b88e271ce0dcbcb3b074b 0 received. +[stage-31] [replica-1] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 0 received. [stage-31] [replica-1] Successfully received RDB file from master. [stage-31] Creating replica : 2. [stage-31] [replica-2] $ redis-cli PING @@ -436,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 0b0846db44656421a48b88e271ce0dcbcb3b074b 0 received. +[stage-31] [replica-2] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 0 received. [stage-31] [replica-2] Successfully received RDB file from master. [stage-31] Creating replica : 3. [stage-31] [replica-3] $ redis-cli PING @@ -444,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 0b0846db44656421a48b88e271ce0dcbcb3b074b 0 received. +[stage-31] [replica-3] FULLRESYNC 7a82716c4a35f6952cedf4c41a5ce8ab3f188a50 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 @@ -460,7 +480,7 @@ 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 4 2000 +[stage-31] [client] $ redis-cli WAIT 2 2000 [stage-31] [replica-1] SET baz 789 received. [stage-31] [replica-1] REPLCONF GETACK * received. [stage-31] [replica-2] SET baz 789 received. @@ -468,9 +488,7 @@ Debug = true [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] [replica-2] $ redis-cli REPLCONF ACK 179 -[stage-31] [replica-3] $ redis-cli REPLCONF ACK 179 -[stage-31] [client] 3 received. +[stage-31] [client] 1 received. [stage-31] [client] WAIT command returned after 2004 ms [stage-31] Test passed. [stage-31] Terminating program