From bdabb5128a80345ffcef04d567017a5abf551bb9 Mon Sep 17 00:00:00 2001 From: Madelyn Olson Date: Sun, 5 Jan 2025 23:29:12 -0800 Subject: [PATCH] Remove test that relies on functionality from unstable Signed-off-by: Madelyn Olson --- .../integration/dual-channel-replication.tcl | 56 ------------------- 1 file changed, 56 deletions(-) diff --git a/tests/integration/dual-channel-replication.tcl b/tests/integration/dual-channel-replication.tcl index 05e497d1a..2373d093f 100644 --- a/tests/integration/dual-channel-replication.tcl +++ b/tests/integration/dual-channel-replication.tcl @@ -1189,59 +1189,3 @@ start_server {tags {"dual-channel-replication external:skip"}} { stop_write_load $load_handle } } - - -start_server {tags {"dual-channel-replication external:skip"}} { - set primary [srv 0 client] - set primary_host [srv 0 host] - set primary_port [srv 0 port] - - $primary config set repl-diskless-sync yes - $primary config set dual-channel-replication-enabled yes - $primary config set repl-diskless-sync-delay 5; # allow catch failed sync before retry - - # Generating RDB will take 100 sec to generate - $primary debug populate 1000000 primary 1 - $primary config set rdb-key-save-delay -10 - - start_server {} { - set replica [srv 0 client] - set replica_host [srv 0 host] - set replica_port [srv 0 port] - set replica_log [srv 0 stdout] - - $replica config set dual-channel-replication-enabled yes - $replica config set loglevel debug - $replica config set repl-timeout 10 - $replica config set repl-diskless-load flush-before-load - - test "Replica notice main-connection killed during rdb load callback" {; # https://github.com/valkey-io/valkey/issues/1152 - set loglines [count_log_lines 0] - $replica replicaof $primary_host $primary_port - # Wait for sync session to start - wait_for_condition 500 1000 { - [string match "*slave*,state=wait_bgsave*,type=rdb-channel*" [$primary info replication]] && - [string match "*slave*,state=bg_transfer*,type=main-channel*" [$primary info replication]] && - [s -1 rdb_bgsave_in_progress] eq 1 - } else { - fail "replica didn't start sync session in time" - } - wait_for_log_messages 0 {"*Loading RDB produced by Valkey version*"} $loglines 1000 10 - $primary set key val - set replica_main_conn_id [get_client_id_by_last_cmd $primary "psync"] - $primary debug log "killing replica main connection $replica_main_conn_id" - assert {$replica_main_conn_id != ""} - set loglines [count_log_lines 0] - $primary config set rdb-key-save-delay 0; # disable delay to allow next sync to succeed - $primary client kill id $replica_main_conn_id - # Wait for primary to abort the sync - wait_for_condition 50 1000 { - [string match {*replicas_waiting_psync:0*} [$primary info replication]] - } else { - fail "Primary did not free repl buf block after sync failure" - } - wait_for_log_messages 0 {"*Failed trying to load the PRIMARY synchronization DB from socket*"} $loglines 1000 10 - verify_replica_online $primary 0 500 - } - } -}