3 files changed, 128 insertions, 0 deletions
diff --git a/tests/unit/cluster/announced-endpoints.tcl b/tests/unit/cluster/announced-endpoints.tcl
new file mode 100644
index 0000000..941a8e0
--- /dev/null
+++ b/tests/unit/cluster/announced-endpoints.tcl
@@ -0,0 +1,42 @@
+start_cluster 2 2 {tags {external:skip cluster}} {
+
+    test "Test change cluster-announce-port and cluster-announce-tls-port at runtime" {
+        set baseport [lindex [R 0 config get port] 1]
+        set count [expr [llength $::servers] +1 ]
+        set used_port [find_available_port $baseport $count]
+
+        R 0 config set cluster-announce-tls-port $used_port
+        R 0 config set cluster-announce-port $used_port
+
+        assert_match "*:$used_port@*" [R 0 CLUSTER NODES]
+        wait_for_condition 50 100 {
+            [string match "*:$used_port@*" [R 1 CLUSTER NODES]]
+        } else {
+            fail "Cluster announced port was not propagated via gossip"
+        }
+
+        R 0 config set cluster-announce-tls-port 0
+        R 0 config set cluster-announce-port 0
+        assert_match "*:$baseport@*" [R 0 CLUSTER NODES] 
+    }
+
+    test "Test change cluster-announce-bus-port at runtime" {
+        set baseport [lindex [R 0 config get port] 1]
+        set count [expr [llength $::servers] +1 ]
+        set used_port [find_available_port $baseport $count]
+
+        # Verify config set cluster-announce-bus-port
+        R 0 config set cluster-announce-bus-port $used_port
+        assert_match "*@$used_port *" [R 0 CLUSTER NODES]
+        wait_for_condition 50 100 {
+            [string match "*@$used_port *" [R 1 CLUSTER NODES]]
+        } else {
+            fail "Cluster announced port was not propagated via gossip"
+        }
+
+        # Verify restore default cluster-announce-port
+        set base_bus_port [expr $baseport + 10000]
+        R 0 config set cluster-announce-bus-port 0
+        assert_match "*@$base_bus_port *" [R 0 CLUSTER NODES]
+    }
+}
diff --git a/tests/unit/cluster/links.tcl b/tests/unit/cluster/links.tcl
new file mode 100644
index 0000000..0d17b91
--- /dev/null
+++ b/tests/unit/cluster/links.tcl
@@ -0,0 +1,70 @@
+
+proc number_of_peers {id} {
+    expr [llength $::servers] - 1
+}
+
+proc number_of_links {id} {
+    llength [R $id cluster links]
+}
+
+proc publish_messages {server num_msgs msg_size} {
+    for {set i 0} {$i < $num_msgs} {incr i} {
+        $server PUBLISH channel [string repeat "x" $msg_size]
+    }
+}
+
+start_cluster 1 2 {tags {external:skip cluster}} {
+    set primary_id 0
+    set replica1_id 1
+
+    set primary [Rn $primary_id]
+    set replica1 [Rn $replica1_id]
+
+    test "Broadcast message across a cluster shard while a cluster link is down" {
+        set replica1_node_id [$replica1 CLUSTER MYID]
+
+        set channelname ch3
+
+        # subscribe on replica1
+        set subscribeclient1 [redis_deferring_client -1]
+        $subscribeclient1 deferred 1
+        $subscribeclient1 SSUBSCRIBE $channelname
+        $subscribeclient1 read
+
+        # subscribe on replica2
+        set subscribeclient2 [redis_deferring_client -2]
+        $subscribeclient2 deferred 1
+        $subscribeclient2 SSUBSCRIBE $channelname
+        $subscribeclient2 read
+
+        # Verify number of links with cluster stable state
+        assert_equal [expr [number_of_peers $primary_id]*2] [number_of_links $primary_id]
+
+        # Disconnect the cluster between primary and replica1 and publish a message.
+        $primary MULTI
+        $primary DEBUG CLUSTERLINK KILL TO $replica1_node_id
+        $primary SPUBLISH $channelname hello
+        set res [$primary EXEC]
+
+        # Verify no client exists on the primary to receive the published message.
+        assert_equal $res {OK 0}
+
+        # Wait for all the cluster links are healthy
+        wait_for_condition 50 100 {
+            [number_of_peers $primary_id]*2 == [number_of_links $primary_id]
+        } else {
+            fail "All peer links couldn't be established"
+        }
+
+        # Publish a message afterwards.
+        $primary SPUBLISH $channelname world
+
+        # Verify replica1 has received only (world) / hello is lost.
+        assert_equal "smessage ch3 world" [$subscribeclient1 read]
+
+        # Verify replica2 has received both messages (hello/world)
+        assert_equal "smessage ch3 hello" [$subscribeclient2 read]
+        assert_equal "smessage ch3 world" [$subscribeclient2 read]
+    } {} {needs:debug}
+}
+
diff --git a/tests/unit/cluster/misc.tcl b/tests/unit/cluster/misc.tcl
new file mode 100644
index 0000000..35308b8
--- /dev/null
+++ b/tests/unit/cluster/misc.tcl
@@ -0,0 +1,16 @@
+start_cluster 2 2 {tags {external:skip cluster}} {
+    test {Key lazy expires during key migration} {
+        R 0 DEBUG SET-ACTIVE-EXPIRE 0
+
+        set key_slot [R 0 CLUSTER KEYSLOT FOO]
+        R 0 set FOO BAR PX 10
+        set src_id [R 0 CLUSTER MYID]
+        set trg_id [R 1 CLUSTER MYID]
+        R 0 CLUSTER SETSLOT $key_slot MIGRATING $trg_id
+        R 1 CLUSTER SETSLOT $key_slot IMPORTING $src_id
+        after 11
+        assert_error {ASK*} {R 0 GET FOO}
+        R 0 ping
+    } {PONG}
+}
+